diff --git a/docs/projectgraph.md b/docs/projectgraph.md index 301dfcb7..3c4c40b7 100644 --- a/docs/projectgraph.md +++ b/docs/projectgraph.md @@ -1,1102 +1,323 @@ # Project graph -The project graph is the call graph of a whole project, across its files -and into the code of its dependencies. It answers one question: does code -that runs reach an external symbol, as `yaml//load`? The answer is `found`, -`not-found` or `uncertain`, and the library never gives `not-found` when it +The project graph is the call graph of a whole project, across its files and +into the code of its dependencies. It answers one question. Does code that runs +reach an external symbol, as `yaml//load`? The answer is `found`, `not-found`, +`uncertain` or `no-such-target`. The library never gives `not-found` when it does not know. -Five calls make the graph. Each one reads only the output of the one -before it, so a job can run them at different times and keep the output of -each in a store. +This guide tells a caller what to call, what each call gives and what the +answers mean. The code, its comments and the cases under +`test/projectgraph/cases` record each rule. The `description` of each +`expect.yaml` tells in prose what its case pins. + +## Steps + +Each step reads only the output of the step before it. A job can run the steps +at different times and keep the output of each step in a store. | Step | Call | Reads | Gives | | --- | --- | --- | --- | -| Index | `indexer.New` and `Indexer.Run` | The source files, with tree-sitter | One `fileindex.Index` per file | +| Index | `indexer.New`, `Indexer.Run` | The source files, with tree-sitter | One `fileindex.Index` per file | | Link | `projectgraph.Build` | The indexes and the manifests | A `projectgraph.Graph` | -| Roots | `rootmatch.Find` | The indexes and the manifests | The roots of the graph. `Build` calls it | +| Roots | `rootmatch.Find` | The indexes and the manifests | The roots of the graph. `Build` calls it, so a caller does not | | Reach | `reach.Reach` | The graph | One `reach.Result` per target | -| Summary | `summary.Build` | The indexes of one package | A `summary.Summary` of the package | - -The index step is the only one that parses source. It needs CGO. The other -steps read records and build with `CGO_ENABLED=0`. - -An [overlay](#overlay) is an optional step between the link step and the -reach query. It merges edges that a model proposed for the call sites -that the link step could not resolve. +| Summary | `summary.Build` | The indexes of one package | A `summary.Result` that holds the `summary.Summary` of the package | -`examples/projectgraph` runs all five from the command line. +Only the index step parses source, and only the index step needs CGO. The other +steps build with `CGO_ENABLED=0`. An [overlay](#overlay) is an optional step +between the link step and the reach query. It merges edges that a model +proposed for the call sites that the link step did not resolve. +`examples/projectgraph` runs all the steps from the command line. ## Index ```go -ix, err := indexer.New(indexer.Options{ - Languages: languages, - Store: store, - Workers: 4, +languages, err := lang.AllLanguages() +fsys, err := fs.NewLocalFileSystem(fs.LocalFileSystemConfig{ + AppDirectories: []string{root}, + ImportDirectories: []string{lodashDir}, + ImportUnits: map[string]string{lodashDir: "npm:lodash@4.17.21"}, }) +ix, err := indexer.New(indexer.Options{Languages: languages, Store: memstore.New(), Imports: true}) indexed, err := ix.Run(ctx, fsys) ``` -`New` validates the options: a run needs a language, two languages -cannot share a file extension, and a size limit or a number of workers -cannot be negative. `Run` walks the file system, reads each file once and gives the tree of the -file to the index plugin. The index of a file holds what the link step -needs: the imports, the exports, the definitions, the classes with their -bases, the calls with their resolved targets, the references, the -unresolved call sites and the dynamic flags. It holds no tree-sitter node -and no source text past a short call text. - -`indexer.Options` has these fields. - -| Field | Meaning | +| `indexer.Options` field | Meaning | | --- | --- | | `Languages` | The languages to index. The run reads only the files that one of them parses | | `Store` | A `store.Store` that keeps the indexes between runs. A nil store parses every file | | `Plugins` | Extra plugins that run on the tree of each file | -| `MaxFileBytes` | The size limit of a file. A larger file fails. Zero selects 4 MiB | -| `Workers` | The number of files to parse at once. Zero selects the number of CPUs. The result does not depend on it | -| `Imports` | Index the files of the import directories too. Each one needs a package unit, as `npm:lodash@4.17.21` | - -`indexer.Result` holds the indexes in path order, the status of each file -(`indexed`, `cached`, `missing`, `failed`, `truncated`), the same for the -files of dependency code, and the report of the run. `Result.Unit` returns -the indexes and the files of one unit of dependency code. - -A generated Go file of a unit, with a `// Code generated ... DO NOT EDIT.` -line or a name that starts with `tables`, can hit a limit of the index, -as a table of thousands of entries. Its index then comes from the file -with each top-level var value that holds only data blanked. Function bodies -and values with a call or a function literal stay, so the calls of a -generated file, as a `.pb.go` file, stay in the graph. A var value that -names a function stays too, as a map of handlers, because a call of a -function value finds the function only through that reference. The index keeps the -hash of the file. If the skeleton still hits a limit, the file stays -truncated, and reach counts it as budget. - -The JavaScript language reads `.jsx` files with its grammar, which parses -JSX. It also reads the component files of Vue, Svelte and Astro (`.vue`, -`.svelte`, `.astro`). The parse reads only the ` + +

{digest('x')}

diff --git a/test/projectgraph/cases/go/svelte-node-builtin/project/web/src/hash.js b/test/projectgraph/cases/go/svelte-node-builtin/project/web/src/hash.js new file mode 100644 index 00000000..a85dbc55 --- /dev/null +++ b/test/projectgraph/cases/go/svelte-node-builtin/project/web/src/hash.js @@ -0,0 +1,5 @@ +import crypto from 'crypto'; + +export function digest(text) { + return crypto.createHash('sha256').update(text).digest('hex'); +} diff --git a/test/projectgraph/cases/go/typed-local-shadow/expect.yaml b/test/projectgraph/cases/go/typed-local-shadow/expect.yaml new file mode 100644 index 00000000..4efe94c9 --- /dev/null +++ b/test/projectgraph/cases/go/typed-local-shadow/expect.yaml @@ -0,0 +1,369 @@ +source: safedep:hand +description: >- + main declares x as a local, and an inner block declares x again as a remote. The call x.run() in the block runs + remote.run, which calls os/exec.LookPath. The index records the typed locals of a function with no extent, and the + link step reads the type of the first one. So the index checks that the binding of x in scope at the call is the + binding whose type the link step reads. Here it is not. The method value x.stop is an unknown-receiver record with + the method name stop, which gets a name edge to remote.stop. Without the rule, a type of the first x gives not-found + for os/exec.LookPath. The call x.run() before the block keeps its member edge to local.run. pick binds r once and + types it by the assignment r = &remote{}, and named types its named result l by an assignment. Each function binds + the name once, so the assignment types that variable, and the call keeps its member edge. Without the rule, a record + there gives a name edge to the run of the other type, and a target behind it reads found. The binding of x in the + block of main has a type of its own, so the index gives the call the target of that binding under an alias, and the + call gets a member edge to remote.run. siblings does the same in each of two blocks. viaLit calls run on the + parameter x of a function literal, which no type of the index names, so the call is a record. pickIface types r by + an assignment, but r holds the interface runner from the field r, so the writes do not agree and the call is a + record too. Without the rule, a type of local for each of the two gives not-found for os/exec.LookPath. In idiom.go, + parse declares url from url.Parse, and the local binds no name at the call, so the call keeps its edge to the + import. viaParam and viaRange bind log, which shadows the import of log, so the index takes no target of the import. + The parameter of the type logger and the range variable over ls []logger each give a member edge to logger.Println. + In shadowedParam of main.go a local o shadows the parameter o, so the field r of the parameter type does not type x, + and the call x.run() is a record. pool.get declares call from an element of the field calls map[string]*remote, in + the form call, dup := p.calls[key], and fromSlice declares r from an element of a parameter []*remote. The declared + element type of the map and of the slice gives the write its type, so each write gives remote, and each call keeps + its member edge to remote.run. Without the rule, a write of no known type there makes the call a record with a name + edge to local.run. loopThenVar calls run on a range variable over rs []*remote and declares r *local after the loop. + The range clause gives r the element type remote, so the call keeps its member edge to remote.run. Without the type, + the call is a record with a name edge to local.run. +roots: + - key: idiom.go + kind: main + rule: go.main + - key: main.go + kind: main + rule: go.main + - key: main.go//main + kind: main + rule: go.main +edges: + - from: main.go//main + to: main.go//local//run + kind: member + confidence: high + site: main.go:20 + - from: main.go//main + to: main.go//remote//run + kind: member + confidence: high + site: main.go:23 + - from: main.go//siblings + to: main.go//remote//run + kind: member + confidence: high + site: main.go:72 + - from: main.go//local//viaLit + to: main.go//remote//run + kind: name + confidence: low + site: main.go:49 + - from: main.go//pickIface + to: main.go//remote//run + kind: name + confidence: low + site: main.go:62 + - from: main.go//main + to: main.go//remote//stop + kind: name + confidence: low + site: main.go:24 + - from: main.go//pick + to: main.go//remote//run + kind: member + confidence: high + site: main.go:38 + - from: main.go//named + to: main.go//local//run + kind: member + confidence: high + site: main.go:43 + - from: main.go//pool//get + to: main.go//remote//run + kind: member + confidence: high + site: main.go:95 + - from: main.go//fromSlice + to: main.go//remote//run + kind: member + confidence: high + site: main.go:103 + - from: main.go//loopThenVar + to: main.go//remote//run + kind: member + confidence: high + site: main.go:108 +no_edges: + - from: main.go//loopThenVar + to: main.go//local//run + - from: main.go//pool//get + to: main.go//local//run + - from: main.go//fromSlice + to: main.go//local//run + - from: main.go//local//run + to: os//exec//LookPath + - from: main.go//pick + to: main.go//local//run + - from: main.go//named + to: main.go//remote//run +unresolved: + - caller: log//Println + reason: no-dependency-source + callback: true + - caller: main.go//local//viaLit + reason: no-dependency-source + callback: true + - caller: main.go//main + reason: no-dependency-source + callback: true + - caller: main.go//pickIface + reason: no-dependency-source + callback: true + - caller: main.go//shadowedParam + reason: no-dependency-source + callback: true + - caller: net//url//Parse + reason: no-dependency-source + callback: true + - caller: os//Getwd + reason: no-dependency-source + callback: true + - caller: os//Mkdir + reason: no-dependency-source + callback: true + - caller: os//Remove + reason: no-dependency-source + callback: true + - caller: os//exec//LookPath + reason: no-dependency-source + callback: true + - caller: idiom.go//parse + site: idiom.go:14 + reason: no-dependency-source + method: Host + - caller: main.go//main + site: main.go:24 + reason: unknown-receiver + method: stop + - caller: main.go//main + site: main.go:25 + reason: function-value + - caller: main.go//main + site: main.go:25 + reason: unknown-receiver + method: f + - caller: main.go//local//viaLit + site: main.go:49 + reason: unknown-receiver + method: run + - caller: main.go//pickIface + site: main.go:62 + reason: unknown-receiver + method: run + - caller: main.go//shadowedParam + site: main.go:79 + reason: unknown-receiver + method: r + - caller: main.go//shadowedParam + site: main.go:81 + reason: unknown-receiver + method: run +results: + - target: os//Getwd + status: found + path: + - key: main.go//main + - key: main.go//local//run + site: main.go:20 + kind: member + confidence: high + - key: os//Getwd + site: main.go:10 + kind: direct + confidence: high + call_sites: + - caller: main.go//local//run + site: main.go:10 + reached: true + - target: os//exec//LookPath + status: found + path: + - key: main.go//main + - key: main.go//remote//run + site: main.go:23 + kind: member + confidence: high + - key: os//exec//LookPath + site: main.go:14 + kind: direct + confidence: high + call_sites: + - caller: main.go//remote//run + site: main.go:14 + reached: true + - target: os//Remove + status: found + path: + - key: main.go//main + - key: main.go//remote//stop + site: main.go:24 + kind: name + confidence: low + - key: os//Remove + site: main.go:16 + kind: direct + confidence: high + call_sites: + - caller: main.go//remote//stop + site: main.go:16 + reached: true + - target: os//Getwd + sources: [main.go//pick] + sources_only: true + status: not-found + call_sites: + - caller: main.go//local//run + site: main.go:10 + reached: false + - target: os//exec//LookPath + sources: [main.go//named] + sources_only: true + status: not-found + call_sites: + - caller: main.go//remote//run + site: main.go:14 + reached: false + - target: os//exec//LookPath + sources: [main.go//local//viaLit] + sources_only: true + status: found + path: + - key: main.go//local//viaLit + - key: main.go//remote//run + site: main.go:49 + kind: name + confidence: low + - key: os//exec//LookPath + site: main.go:14 + kind: direct + confidence: high + call_sites: + - caller: main.go//remote//run + site: main.go:14 + reached: true + - target: os//exec//LookPath + sources: [main.go//pickIface] + sources_only: true + status: found + path: + - key: main.go//pickIface + - key: main.go//remote//run + site: main.go:62 + kind: name + confidence: low + - key: os//exec//LookPath + site: main.go:14 + kind: direct + confidence: high + call_sites: + - caller: main.go//remote//run + site: main.go:14 + reached: true + - target: net//url//Parse + sources: [idiom.go//parse] + sources_only: true + status: found + path: + - key: idiom.go//parse + - key: net//url//Parse + site: idiom.go:10 + kind: direct + confidence: high + call_sites: + - caller: idiom.go//parse + site: idiom.go:10 + reached: true + - target: os//Mkdir + sources: [idiom.go//viaParam] + sources_only: true + status: found + path: + - key: idiom.go//viaParam + - key: idiom.go//logger//Println + site: idiom.go:28 + kind: member + confidence: high + - key: os//Mkdir + site: idiom.go:19 + kind: direct + confidence: high + call_sites: + - caller: idiom.go//logger//Println + site: idiom.go:19 + reached: true + - target: log//Println + sources: [idiom.go//viaParam] + sources_only: true + status: not-found + call_sites: + - caller: idiom.go//keepLog + site: idiom.go:31 + reached: false + - target: os//Mkdir + sources: [idiom.go//viaRange] + sources_only: true + status: found + path: + - key: idiom.go//viaRange + - key: idiom.go//logger//Println + site: idiom.go:23 + kind: member + confidence: high + - key: os//Mkdir + site: idiom.go:19 + kind: direct + confidence: high + call_sites: + - caller: idiom.go//logger//Println + site: idiom.go:19 + reached: true + - target: os//Getwd + sources: [main.go//shadowedParam] + sources_only: true + status: found + path: + - key: main.go//shadowedParam + - key: main.go//local//run + site: main.go:81 + kind: name + confidence: low + - key: os//Getwd + site: main.go:10 + kind: direct + confidence: high + call_sites: + - caller: main.go//local//run + site: main.go:10 + reached: true + - target: os//Getwd + sources: [main.go//pool//get] + sources_only: true + status: not-found + call_sites: + - caller: main.go//local//run + site: main.go:10 + reached: false + - target: os//Getwd + sources: [main.go//fromSlice] + sources_only: true + status: not-found + call_sites: + - caller: main.go//local//run + site: main.go:10 + reached: false + - target: os//Getwd + sources: [main.go//loopThenVar] + sources_only: true + status: not-found + call_sites: + - caller: main.go//local//run + site: main.go:10 + reached: false diff --git a/test/projectgraph/cases/go/typed-local-shadow/project/go.mod b/test/projectgraph/cases/go/typed-local-shadow/project/go.mod new file mode 100644 index 00000000..925d4b78 --- /dev/null +++ b/test/projectgraph/cases/go/typed-local-shadow/project/go.mod @@ -0,0 +1,3 @@ +module example.com/app + +go 1.22 diff --git a/test/projectgraph/cases/go/typed-local-shadow/project/idiom.go b/test/projectgraph/cases/go/typed-local-shadow/project/idiom.go new file mode 100644 index 00000000..dbceda54 --- /dev/null +++ b/test/projectgraph/cases/go/typed-local-shadow/project/idiom.go @@ -0,0 +1,31 @@ +package main + +import ( + "log" + "net/url" + "os" +) + +func parse(raw string) string { + url, err := url.Parse(raw) + if err != nil { + return "" + } + return url.Host +} + +type logger struct{} + +func (logger) Println() { os.Mkdir("d", 0o755) } + +func viaRange(ls []logger) { + for _, log := range ls { + log.Println() + } +} + +func viaParam(log logger) { + log.Println() +} + +func keepLog() { log.Println("x") } diff --git a/test/projectgraph/cases/go/typed-local-shadow/project/main.go b/test/projectgraph/cases/go/typed-local-shadow/project/main.go new file mode 100644 index 00000000..9cdb9452 --- /dev/null +++ b/test/projectgraph/cases/go/typed-local-shadow/project/main.go @@ -0,0 +1,112 @@ +package main + +import ( + "os" + "os/exec" +) + +type local struct{} + +func (local) run() { os.Getwd() } + +type remote struct{} + +func (remote) run() { exec.LookPath("ls") } + +func (remote) stop() { os.Remove("x") } + +func main() { + x := local{} + x.run() + { + x := remote{} + x.run() + f := x.stop + f() + } + pick(opts{}) + named() +} + +type opts struct{ r *remote } + +func pick(o opts) { + r := o.r + if r == nil { + r = &remote{} + } + r.run() +} + +func named() (l *local) { + l = &local{} + l.run() + return +} + +func (x local) viaLit(r remote) { + go func(x remote) { + x.run() + }(r) +} + +type runner interface{ run() } + +type optsIface struct{ r runner } + +func pickIface(o optsIface) { + r := o.r + if r == nil { + r = &local{} + } + r.run() +} + +func siblings() { + { + x := local{} + x.run() + } + { + x := remote{} + x.run() + } +} + +func shadowedParam(o opts, rs []runner) { + { + o := struct{ r runner }{rs[0]} + x := o.r + x = &remote{} + x.run() + } +} + +type pool struct { + calls map[string]*remote +} + +func (p *pool) get(key string) { + call, dup := p.calls[key] + if !dup { + call = &remote{} + p.calls[key] = call + } + call.run() +} + +func fromSlice(rs []*remote, i int) { + r := rs[i] + if r == nil { + r = &remote{} + } + r.run() +} + +func loopThenVar(rs []*remote) { + for _, r := range rs { + r.run() + } + var r *local + _ = r +} diff --git a/test/projectgraph/cases/javascript/astro-markup/expect.yaml b/test/projectgraph/cases/javascript/astro-markup/expect.yaml index 166ed1f0..0f7d34a6 100644 --- a/test/projectgraph/cases/javascript/astro-markup/expect.yaml +++ b/test/projectgraph/cases/javascript/astro-markup/expect.yaml @@ -1,6 +1,9 @@ source: safedep:hand description: An expression in the body of Page.astro calls adanger, which its fence imports. The index does not parse the body, so the file has a markup record, and adanger reads uncertain, not no-such-target. roots: + - key: src/Page.astro + kind: framework + rule: node.component - key: src/main.js kind: manifest rule: node.package-json @@ -24,11 +27,7 @@ results: - target: plug//asetup status: found path: - - key: src/main.js - key: src/Page.astro - site: src/main.js:1 - kind: import - confidence: high - key: plug//asetup site: src/Page.astro:3 kind: direct diff --git a/test/projectgraph/cases/javascript/astro-pages/expect.yaml b/test/projectgraph/cases/javascript/astro-pages/expect.yaml new file mode 100644 index 00000000..a4be8854 --- /dev/null +++ b/test/projectgraph/cases/javascript/astro-pages/expect.yaml @@ -0,0 +1,142 @@ +source: safedep:hand +description: >- + Astro loads each file of src/pages by its path, and no file imports it. Each component file is a root + of the rule node.component. The rule node.astro.page marks each file of src/pages with its exports, the + actions, the content config and astro.config.mjs. So danger of index.astro, store of the endpoint GET of + api/data.ts, act of an action, collect of the content config and integrate of the config are found. +roots: + - key: astro.config.mjs + kind: framework + rule: node.astro.page + - key: server.js + kind: manifest + rule: node.package-json + - key: src/actions/index.ts + kind: framework + rule: node.astro.page + - key: src/actions/index.ts//server + kind: framework + rule: node.astro.page + - key: src/actions/index.ts//server//go//handler + kind: framework + rule: node.astro.page + - key: src/content/config.ts + kind: framework + rule: node.astro.page + - key: src/content/config.ts//collections + kind: framework + rule: node.astro.page + - key: src/pages/api/data.ts + kind: framework + rule: node.astro.page + - key: src/pages/api/data.ts//GET + kind: framework + rule: node.astro.page + - key: src/pages/index.astro + kind: framework + rule: node.astro.page + - key: src/pages/index.astro + kind: framework + rule: node.component +exact_edges: true +edges: + - from: astro.config.mjs + to: plug//integrate + kind: direct + confidence: high + site: astro.config.mjs:3 + - from: server.js + to: plug//listen + kind: direct + confidence: high + site: server.js:3 + - from: src/actions/index.ts//server//go//handler + to: plug//act + kind: direct + confidence: high + site: src/actions/index.ts:3 + - from: src/content/config.ts + to: plug//collect + kind: direct + confidence: high + site: src/content/config.ts:3 + - from: src/pages/api/data.ts//GET + to: plug//store + kind: direct + confidence: high + site: src/pages/api/data.ts:4 + - from: src/pages/index.astro + to: plug//danger + kind: direct + confidence: high + site: src/pages/index.astro:3 +unresolved: + - caller: src/pages/index.astro + site: src/pages/index.astro:1 + reason: markup +results: + - target: plug//danger + status: found + path: + - key: src/pages/index.astro + root: framework + - key: plug//danger + site: src/pages/index.astro:3 + kind: direct + confidence: high + call_sites: + - caller: src/pages/index.astro + site: src/pages/index.astro:3 + reached: true + - target: plug//store + status: found + path: + - key: src/pages/api/data.ts//GET + root: framework + - key: plug//store + site: src/pages/api/data.ts:4 + kind: direct + confidence: high + call_sites: + - caller: src/pages/api/data.ts//GET + site: src/pages/api/data.ts:4 + reached: true + - target: plug//integrate + status: found + path: + - key: astro.config.mjs + root: framework + - key: plug//integrate + site: astro.config.mjs:3 + kind: direct + confidence: high + call_sites: + - caller: astro.config.mjs + site: astro.config.mjs:3 + reached: true + - target: plug//collect + status: found + path: + - key: src/content/config.ts + root: framework + - key: plug//collect + site: src/content/config.ts:3 + kind: direct + confidence: high + call_sites: + - caller: src/content/config.ts + site: src/content/config.ts:3 + reached: true + - target: plug//act + status: found + path: + - key: src/actions/index.ts//server//go//handler + root: framework + - key: plug//act + site: src/actions/index.ts:3 + kind: direct + confidence: high + call_sites: + - caller: src/actions/index.ts//server//go//handler + site: src/actions/index.ts:3 + reached: true diff --git a/test/projectgraph/cases/javascript/astro-pages/project/astro.config.mjs b/test/projectgraph/cases/javascript/astro-pages/project/astro.config.mjs new file mode 100644 index 00000000..ab5551ed --- /dev/null +++ b/test/projectgraph/cases/javascript/astro-pages/project/astro.config.mjs @@ -0,0 +1,3 @@ +import { integrate } from 'plug'; + +export default { integrations: [integrate()] }; diff --git a/test/projectgraph/cases/javascript/astro-pages/project/package.json b/test/projectgraph/cases/javascript/astro-pages/project/package.json new file mode 100644 index 00000000..7c47ca78 --- /dev/null +++ b/test/projectgraph/cases/javascript/astro-pages/project/package.json @@ -0,0 +1,5 @@ +{ + "name": "astro-pages", + "main": "server.js", + "dependencies": { "astro": "^4.5.0" } +} diff --git a/test/projectgraph/cases/javascript/astro-pages/project/server.js b/test/projectgraph/cases/javascript/astro-pages/project/server.js new file mode 100644 index 00000000..fc1cd6f8 --- /dev/null +++ b/test/projectgraph/cases/javascript/astro-pages/project/server.js @@ -0,0 +1,3 @@ +import { listen } from 'plug'; + +listen(3000); diff --git a/test/projectgraph/cases/javascript/astro-pages/project/src/actions/index.ts b/test/projectgraph/cases/javascript/astro-pages/project/src/actions/index.ts new file mode 100644 index 00000000..5dfe8073 --- /dev/null +++ b/test/projectgraph/cases/javascript/astro-pages/project/src/actions/index.ts @@ -0,0 +1,3 @@ +import { act } from 'plug'; + +export const server = { go: { handler: async () => act() } }; diff --git a/test/projectgraph/cases/javascript/astro-pages/project/src/content/config.ts b/test/projectgraph/cases/javascript/astro-pages/project/src/content/config.ts new file mode 100644 index 00000000..2ff173a2 --- /dev/null +++ b/test/projectgraph/cases/javascript/astro-pages/project/src/content/config.ts @@ -0,0 +1,3 @@ +import { collect } from 'plug'; + +export const collections = { blog: collect() }; diff --git a/test/projectgraph/cases/javascript/astro-pages/project/src/pages/api/data.ts b/test/projectgraph/cases/javascript/astro-pages/project/src/pages/api/data.ts new file mode 100644 index 00000000..b218695a --- /dev/null +++ b/test/projectgraph/cases/javascript/astro-pages/project/src/pages/api/data.ts @@ -0,0 +1,5 @@ +import { store } from 'plug'; + +export function GET() { + return store(); +} diff --git a/test/projectgraph/cases/javascript/astro-pages/project/src/pages/index.astro b/test/projectgraph/cases/javascript/astro-pages/project/src/pages/index.astro new file mode 100644 index 00000000..81fdf4a9 --- /dev/null +++ b/test/projectgraph/cases/javascript/astro-pages/project/src/pages/index.astro @@ -0,0 +1,5 @@ +--- +import { danger } from 'plug'; +danger(); +--- +

home

diff --git a/test/projectgraph/cases/javascript/builtin-chain/summaries/npm_plug_1.0.0.json b/test/projectgraph/cases/javascript/builtin-chain/summaries/npm_plug_1.0.0.json index c4c68898..3591fcec 100644 --- a/test/projectgraph/cases/javascript/builtin-chain/summaries/npm_plug_1.0.0.json +++ b/test/projectgraph/cases/javascript/builtin-chain/summaries/npm_plug_1.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "npm:plug@1.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/javascript/component-reexport-star/expect.yaml b/test/projectgraph/cases/javascript/component-reexport-star/expect.yaml new file mode 100644 index 00000000..2e8d7f86 --- /dev/null +++ b/test/projectgraph/cases/javascript/component-reexport-star/expect.yaml @@ -0,0 +1,70 @@ +source: safedep:hand +description: >- + The template of App.vue calls api.t5, and api is the module reexport.js, which gives on each name of + plug. Only the Python test calls plug.t5 by an edge. A file of the JavaScript family gives on the module + plug, so the markup record concerns plug.t5, and it reads uncertain and not not-found. +test_paths: [tests] +roots: + - key: src/App.vue + kind: framework + rule: node.component + - key: src/main.js + kind: manifest + rule: node.package-json + - key: tests/test_api.py + kind: test + rule: test.files + - key: tests/test_api.py//test_t5 + kind: test + rule: test.files +exact_edges: true +edges: + - from: src/App.vue + to: src/reexport.js + kind: import + confidence: high + site: src/App.vue:2 + - from: src/main.js + to: src/App.vue + kind: import + confidence: high + site: src/main.js:2 + - from: src/main.js + to: vue//createApp + kind: direct + confidence: high + site: src/main.js:4 + - from: src/main.js + to: vue//createApp//mount + kind: direct + confidence: high + site: src/main.js:4 + - from: tests/test_api.py//test_t5 + to: plug//t5 + kind: direct + confidence: high + site: tests/test_api.py:5 +unresolved: + - caller: src/App.vue + site: src/App.vue:1 + reason: markup + - caller: src/main.js + site: src/main.js:4 + reason: no-dependency-source + method: mount +results: + - target: plug//t5 + status: uncertain + test_path: + - key: tests/test_api.py//test_t5 + - key: plug//t5 + site: tests/test_api.py:5 + kind: direct + confidence: high + call_sites: + - caller: tests/test_api.py//test_t5 + site: tests/test_api.py:5 + reached: false + uncertainties: + - kind: unresolved-call + site: src/App.vue:1 diff --git a/test/projectgraph/cases/javascript/component-reexport-star/project/package.json b/test/projectgraph/cases/javascript/component-reexport-star/project/package.json new file mode 100644 index 00000000..7044e959 --- /dev/null +++ b/test/projectgraph/cases/javascript/component-reexport-star/project/package.json @@ -0,0 +1 @@ +{ "name": "component-reexport-star", "main": "src/main.js", "dependencies": { "vue": "^3.4.0" } } diff --git a/test/projectgraph/cases/javascript/component-reexport-star/project/src/App.vue b/test/projectgraph/cases/javascript/component-reexport-star/project/src/App.vue new file mode 100644 index 00000000..30f23b41 --- /dev/null +++ b/test/projectgraph/cases/javascript/component-reexport-star/project/src/App.vue @@ -0,0 +1,7 @@ + + + diff --git a/test/projectgraph/cases/javascript/component-reexport-star/project/src/main.js b/test/projectgraph/cases/javascript/component-reexport-star/project/src/main.js new file mode 100644 index 00000000..684d0421 --- /dev/null +++ b/test/projectgraph/cases/javascript/component-reexport-star/project/src/main.js @@ -0,0 +1,4 @@ +import { createApp } from 'vue'; +import App from './App.vue'; + +createApp(App).mount('#app'); diff --git a/test/projectgraph/cases/javascript/component-reexport-star/project/src/reexport.js b/test/projectgraph/cases/javascript/component-reexport-star/project/src/reexport.js new file mode 100644 index 00000000..ded11f0d --- /dev/null +++ b/test/projectgraph/cases/javascript/component-reexport-star/project/src/reexport.js @@ -0,0 +1 @@ +export * from 'plug'; diff --git a/test/projectgraph/cases/javascript/component-reexport-star/project/tests/test_api.py b/test/projectgraph/cases/javascript/component-reexport-star/project/tests/test_api.py new file mode 100644 index 00000000..de124d17 --- /dev/null +++ b/test/projectgraph/cases/javascript/component-reexport-star/project/tests/test_api.py @@ -0,0 +1,5 @@ +import plug + + +def test_t5(): + plug.t5() diff --git a/test/projectgraph/cases/javascript/component-test-path/expect.yaml b/test/projectgraph/cases/javascript/component-test-path/expect.yaml new file mode 100644 index 00000000..cf1bd8dc --- /dev/null +++ b/test/projectgraph/cases/javascript/component-test-path/expect.yaml @@ -0,0 +1,54 @@ +source: safedep:hand +description: >- + tests/fixtures/T.vue is a component under a test path, so it runs only under a test. The rule + node.component skips a test file, so fixture is not-found in the program and found only on a test path. + The directory weird.vue holds a plain module that no file imports. The rule matches the name of a file + and not of a directory, so helper is not-found. +test_paths: [tests] +roots: + - key: server.js + kind: manifest + rule: node.package-json + - key: tests/fixtures/T.vue + kind: test + rule: test.files +exact_edges: true +edges: + - from: server.js + to: plug//listen + kind: direct + confidence: high + site: server.js:3 + - from: tests/fixtures/T.vue + to: plug//fixture + kind: direct + confidence: high + site: tests/fixtures/T.vue:4 + - from: weird.vue/helper.js + to: plug//helper + kind: direct + confidence: high + site: weird.vue/helper.js:3 +unresolved: + - caller: tests/fixtures/T.vue + site: tests/fixtures/T.vue:1 + reason: markup +results: + - target: plug//fixture + status: not-found + test_path: + - key: tests/fixtures/T.vue + - key: plug//fixture + site: tests/fixtures/T.vue:4 + kind: direct + confidence: high + call_sites: + - caller: tests/fixtures/T.vue + site: tests/fixtures/T.vue:4 + reached: false + - target: plug//helper + status: not-found + call_sites: + - caller: weird.vue/helper.js + site: weird.vue/helper.js:3 + reached: false diff --git a/test/projectgraph/cases/javascript/component-test-path/project/package.json b/test/projectgraph/cases/javascript/component-test-path/project/package.json new file mode 100644 index 00000000..bc2c5d36 --- /dev/null +++ b/test/projectgraph/cases/javascript/component-test-path/project/package.json @@ -0,0 +1,5 @@ +{ + "name": "component-test-path", + "main": "server.js", + "dependencies": { "vue": "^3.4.0" } +} diff --git a/test/projectgraph/cases/javascript/component-test-path/project/server.js b/test/projectgraph/cases/javascript/component-test-path/project/server.js new file mode 100644 index 00000000..fc1cd6f8 --- /dev/null +++ b/test/projectgraph/cases/javascript/component-test-path/project/server.js @@ -0,0 +1,3 @@ +import { listen } from 'plug'; + +listen(3000); diff --git a/test/projectgraph/cases/javascript/component-test-path/project/tests/fixtures/T.vue b/test/projectgraph/cases/javascript/component-test-path/project/tests/fixtures/T.vue new file mode 100644 index 00000000..7edffc79 --- /dev/null +++ b/test/projectgraph/cases/javascript/component-test-path/project/tests/fixtures/T.vue @@ -0,0 +1,9 @@ + + + diff --git a/test/projectgraph/cases/javascript/component-test-path/project/weird.vue/helper.js b/test/projectgraph/cases/javascript/component-test-path/project/weird.vue/helper.js new file mode 100644 index 00000000..14496ca9 --- /dev/null +++ b/test/projectgraph/cases/javascript/component-test-path/project/weird.vue/helper.js @@ -0,0 +1,3 @@ +import { helper } from 'plug'; + +helper(); diff --git a/test/projectgraph/cases/javascript/dependency-candidates/summaries/npm_store-kit_1.0.0.json b/test/projectgraph/cases/javascript/dependency-candidates/summaries/npm_store-kit_1.0.0.json index a52e9868..48500be2 100644 --- a/test/projectgraph/cases/javascript/dependency-candidates/summaries/npm_store-kit_1.0.0.json +++ b/test/projectgraph/cases/javascript/dependency-candidates/summaries/npm_store-kit_1.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "npm:store-kit@1.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/javascript/dependency-exports-import/summaries/npm_kit_1.0.0.json b/test/projectgraph/cases/javascript/dependency-exports-import/summaries/npm_kit_1.0.0.json index c59cf4f8..ef44014e 100644 --- a/test/projectgraph/cases/javascript/dependency-exports-import/summaries/npm_kit_1.0.0.json +++ b/test/projectgraph/cases/javascript/dependency-exports-import/summaries/npm_kit_1.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "npm:kit@1.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/javascript/dependency-exports-require/summaries/npm_kit_1.0.0.json b/test/projectgraph/cases/javascript/dependency-exports-require/summaries/npm_kit_1.0.0.json index c59cf4f8..ef44014e 100644 --- a/test/projectgraph/cases/javascript/dependency-exports-require/summaries/npm_kit_1.0.0.json +++ b/test/projectgraph/cases/javascript/dependency-exports-require/summaries/npm_kit_1.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "npm:kit@1.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/javascript/dependency-method-name/summaries/npm_plug_1.0.0.json b/test/projectgraph/cases/javascript/dependency-method-name/summaries/npm_plug_1.0.0.json index a14fade4..44fbae9f 100644 --- a/test/projectgraph/cases/javascript/dependency-method-name/summaries/npm_plug_1.0.0.json +++ b/test/projectgraph/cases/javascript/dependency-method-name/summaries/npm_plug_1.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "npm:plug@1.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/javascript/dependency-same-path/summaries/npm_util-kit_1.0.0.json b/test/projectgraph/cases/javascript/dependency-same-path/summaries/npm_util-kit_1.0.0.json index 2e8d0346..f4bb7739 100644 --- a/test/projectgraph/cases/javascript/dependency-same-path/summaries/npm_util-kit_1.0.0.json +++ b/test/projectgraph/cases/javascript/dependency-same-path/summaries/npm_util-kit_1.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "npm:util-kit@1.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/javascript/dependency-transitive/summaries/npm_lodash._reinterpolate_3.0.0.json b/test/projectgraph/cases/javascript/dependency-transitive/summaries/npm_lodash._reinterpolate_3.0.0.json index f3b26e6c..d2ad08c7 100644 --- a/test/projectgraph/cases/javascript/dependency-transitive/summaries/npm_lodash._reinterpolate_3.0.0.json +++ b/test/projectgraph/cases/javascript/dependency-transitive/summaries/npm_lodash._reinterpolate_3.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "npm:lodash._reinterpolate@3.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/javascript/dependency-transitive/summaries/npm_lodash_4.17.21.json b/test/projectgraph/cases/javascript/dependency-transitive/summaries/npm_lodash_4.17.21.json index 584208a0..7df354d3 100644 --- a/test/projectgraph/cases/javascript/dependency-transitive/summaries/npm_lodash_4.17.21.json +++ b/test/projectgraph/cases/javascript/dependency-transitive/summaries/npm_lodash_4.17.21.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "npm:lodash@4.17.21", "symbols": [ { diff --git a/test/projectgraph/cases/javascript/library-opaque-export/expect.yaml b/test/projectgraph/cases/javascript/library-opaque-export/expect.yaml new file mode 100644 index 00000000..9413c513 --- /dev/null +++ b/test/projectgraph/cases/javascript/library-opaque-export/expect.yaml @@ -0,0 +1,38 @@ +source: safedep:hand +description: >- + The entry of the library exports api, which holds the result of the call makeApi. A user of the library + calls the functions of api, and no edge names them. So the manifest rule gives the export a + computed-name record of the JavaScript family, and a5 reads uncertain and not not-found. +roots: + - key: src/index.js + kind: manifest + rule: node.package-json + - key: src/index.js//api + kind: manifest + rule: node.package-json +exact_edges: true +edges: + - from: src/index.js + to: src/index.js//makeApi + kind: direct + confidence: high + site: src/index.js:7 + - from: src/index.js//makeApi//get + to: plug//a5 + kind: direct + confidence: high + site: src/index.js:4 +unresolved: + - caller: src/index.js + site: src/index.js:9 + reason: computed-name +results: + - target: plug//a5 + status: uncertain + call_sites: + - caller: src/index.js//makeApi//get + site: src/index.js:4 + reached: false + uncertainties: + - kind: unresolved-call + site: src/index.js:9 diff --git a/test/projectgraph/cases/javascript/library-opaque-export/project/package.json b/test/projectgraph/cases/javascript/library-opaque-export/project/package.json new file mode 100644 index 00000000..624bc881 --- /dev/null +++ b/test/projectgraph/cases/javascript/library-opaque-export/project/package.json @@ -0,0 +1 @@ +{ "name": "library-opaque-export", "main": "src/index.js" } diff --git a/test/projectgraph/cases/javascript/library-opaque-export/project/src/index.js b/test/projectgraph/cases/javascript/library-opaque-export/project/src/index.js new file mode 100644 index 00000000..3ebbf0dd --- /dev/null +++ b/test/projectgraph/cases/javascript/library-opaque-export/project/src/index.js @@ -0,0 +1,9 @@ +import { a5 } from 'plug'; + +function makeApi() { + return { get() { a5(); } }; +} + +const api = makeApi(); + +export { api }; diff --git a/test/projectgraph/cases/javascript/nuxt-pages/expect.yaml b/test/projectgraph/cases/javascript/nuxt-pages/expect.yaml new file mode 100644 index 00000000..bf72ed4f --- /dev/null +++ b/test/projectgraph/cases/javascript/nuxt-pages/expect.yaml @@ -0,0 +1,65 @@ +source: safedep:hand +description: >- + Nuxt loads pages/index.vue and layouts/default.vue by their paths, and no file imports them. Each + component file is a root of the rule node.component, so the calls in their scripts are found. +roots: + - key: layouts/default.vue + kind: framework + rule: node.component + - key: pages/index.vue + kind: framework + rule: node.component + - key: server.js + kind: manifest + rule: node.package-json +exact_edges: true +edges: + - from: layouts/default.vue + to: plug//frame + kind: direct + confidence: high + site: layouts/default.vue:4 + - from: pages/index.vue + to: plug//danger + kind: direct + confidence: high + site: pages/index.vue:4 + - from: server.js + to: plug//listen + kind: direct + confidence: high + site: server.js:3 +unresolved: + - caller: layouts/default.vue + site: layouts/default.vue:1 + reason: markup + - caller: pages/index.vue + site: pages/index.vue:1 + reason: markup +results: + - target: plug//danger + status: found + path: + - key: pages/index.vue + root: framework + - key: plug//danger + site: pages/index.vue:4 + kind: direct + confidence: high + call_sites: + - caller: pages/index.vue + site: pages/index.vue:4 + reached: true + - target: plug//frame + status: found + path: + - key: layouts/default.vue + root: framework + - key: plug//frame + site: layouts/default.vue:4 + kind: direct + confidence: high + call_sites: + - caller: layouts/default.vue + site: layouts/default.vue:4 + reached: true diff --git a/test/projectgraph/cases/javascript/nuxt-pages/project/layouts/default.vue b/test/projectgraph/cases/javascript/nuxt-pages/project/layouts/default.vue new file mode 100644 index 00000000..62892847 --- /dev/null +++ b/test/projectgraph/cases/javascript/nuxt-pages/project/layouts/default.vue @@ -0,0 +1,9 @@ + + + diff --git a/test/projectgraph/cases/javascript/nuxt-pages/project/package.json b/test/projectgraph/cases/javascript/nuxt-pages/project/package.json new file mode 100644 index 00000000..d6b28003 --- /dev/null +++ b/test/projectgraph/cases/javascript/nuxt-pages/project/package.json @@ -0,0 +1,5 @@ +{ + "name": "nuxt-pages", + "main": "server.js", + "dependencies": { "nuxt": "^3.11.0" } +} diff --git a/test/projectgraph/cases/javascript/nuxt-pages/project/pages/index.vue b/test/projectgraph/cases/javascript/nuxt-pages/project/pages/index.vue new file mode 100644 index 00000000..bce26238 --- /dev/null +++ b/test/projectgraph/cases/javascript/nuxt-pages/project/pages/index.vue @@ -0,0 +1,9 @@ + + + diff --git a/test/projectgraph/cases/javascript/nuxt-pages/project/server.js b/test/projectgraph/cases/javascript/nuxt-pages/project/server.js new file mode 100644 index 00000000..fc1cd6f8 --- /dev/null +++ b/test/projectgraph/cases/javascript/nuxt-pages/project/server.js @@ -0,0 +1,3 @@ +import { listen } from 'plug'; + +listen(3000); diff --git a/test/projectgraph/cases/javascript/svelte-markup/expect.yaml b/test/projectgraph/cases/javascript/svelte-markup/expect.yaml index dbc823b2..47a63079 100644 --- a/test/projectgraph/cases/javascript/svelte-markup/expect.yaml +++ b/test/projectgraph/cases/javascript/svelte-markup/expect.yaml @@ -1,6 +1,9 @@ source: safedep:hand description: An event handler in the markup of Other.svelte calls sdanger, which its script imports. The index does not parse the markup, so the file has a markup record, and sdanger reads uncertain, not no-such-target. roots: + - key: src/Other.svelte + kind: framework + rule: node.component - key: src/main.js kind: manifest rule: node.package-json @@ -29,11 +32,7 @@ results: - target: plug//ssetup status: found path: - - key: src/main.js - key: src/Other.svelte - site: src/main.js:2 - kind: import - confidence: high - key: plug//ssetup site: src/Other.svelte:3 kind: direct diff --git a/test/projectgraph/cases/javascript/sveltekit-actions-lib/expect.yaml b/test/projectgraph/cases/javascript/sveltekit-actions-lib/expect.yaml new file mode 100644 index 00000000..8dc1d321 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-actions-lib/expect.yaml @@ -0,0 +1,147 @@ +source: safedep:hand +description: >- + SvelteKit calls each function of the exported object actions of a +page.server.ts by its name, and no + call of the graph names them. The rule node.sveltekit.route marks each function under an exported object + of a route file, so a1 and a2 are found. The API route imports helper by the alias $lib, which SvelteKit + maps to src/lib of the package that depends on @sveltejs/kit, so the call of helper reaches c1. The + object actions of items/+page.server.ts has a satisfies type, and its functions keep their names under + actions, so a6 is found. The function unused inside save is a helper of save, not a member of actions. + No code calls it, so a7 is not-found. Without the rule that skips such a helper, unused is a root and + a7 reads found. +roots: + - key: server.js + kind: manifest + rule: node.package-json + - key: src/routes/api/+server.js + kind: framework + rule: node.sveltekit.route + - key: src/routes/api/+server.js//POST + kind: framework + rule: node.sveltekit.route + - key: src/routes/form/+page.server.ts + kind: framework + rule: node.sveltekit.route + - key: src/routes/form/+page.server.ts//actions + kind: framework + rule: node.sveltekit.route + - key: src/routes/form/+page.server.ts//actions//default + kind: framework + rule: node.sveltekit.route + - key: src/routes/form/+page.server.ts//actions//save + kind: framework + rule: node.sveltekit.route + - key: src/routes/items/+page.server.ts + kind: framework + rule: node.sveltekit.route + - key: src/routes/items/+page.server.ts//actions + kind: framework + rule: node.sveltekit.route + - key: src/routes/items/+page.server.ts//actions//default + kind: framework + rule: node.sveltekit.route +exact_edges: true +edges: + - from: src/routes/form/+page.server.ts//actions//save//unused + to: plug//a7 + kind: direct + confidence: high + site: src/routes/form/+page.server.ts:9 + - from: server.js + to: plug//listen + kind: direct + confidence: high + site: server.js:3 + - from: src/lib/helper.js//helper + to: plug//c1 + kind: direct + confidence: high + site: src/lib/helper.js:4 + - from: src/routes/api/+server.js + to: src/lib/helper.js + kind: import + confidence: high + site: src/routes/api/+server.js:1 + - from: src/routes/api/+server.js//POST + to: src/lib/helper.js//helper + kind: direct + confidence: high + site: src/routes/api/+server.js:4 + - from: src/routes/form/+page.server.ts//actions//default + to: plug//a1 + kind: direct + confidence: high + site: src/routes/form/+page.server.ts:5 + - from: src/routes/form/+page.server.ts//actions//save + to: plug//a2 + kind: direct + confidence: high + site: src/routes/form/+page.server.ts:11 + - from: src/routes/items/+page.server.ts//actions//default + to: plug//a6 + kind: direct + confidence: high + site: src/routes/items/+page.server.ts:6 +unresolved: [] +results: + - target: plug//a1 + status: found + path: + - key: src/routes/form/+page.server.ts//actions//default + root: framework + - key: plug//a1 + site: src/routes/form/+page.server.ts:5 + kind: direct + confidence: high + call_sites: + - caller: src/routes/form/+page.server.ts//actions//default + site: src/routes/form/+page.server.ts:5 + reached: true + - target: plug//a2 + status: found + path: + - key: src/routes/form/+page.server.ts//actions//save + root: framework + - key: plug//a2 + site: src/routes/form/+page.server.ts:11 + kind: direct + confidence: high + call_sites: + - caller: src/routes/form/+page.server.ts//actions//save + site: src/routes/form/+page.server.ts:11 + reached: true + - target: plug//c1 + status: found + path: + - key: src/routes/api/+server.js//POST + root: framework + - key: src/lib/helper.js//helper + site: src/routes/api/+server.js:4 + kind: direct + confidence: high + - key: plug//c1 + site: src/lib/helper.js:4 + kind: direct + confidence: high + call_sites: + - caller: src/lib/helper.js//helper + site: src/lib/helper.js:4 + reached: true + - target: plug//a6 + status: found + path: + - key: src/routes/items/+page.server.ts//actions//default + root: framework + - key: plug//a6 + site: src/routes/items/+page.server.ts:6 + kind: direct + confidence: high + call_sites: + - caller: src/routes/items/+page.server.ts//actions//default + site: src/routes/items/+page.server.ts:6 + reached: true + - target: plug//a7 + status: not-found + call_sites: + - caller: src/routes/form/+page.server.ts//actions//save//unused + site: src/routes/form/+page.server.ts:9 + reached: false diff --git a/test/projectgraph/cases/javascript/sveltekit-actions-lib/project/package.json b/test/projectgraph/cases/javascript/sveltekit-actions-lib/project/package.json new file mode 100644 index 00000000..455a2c4b --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-actions-lib/project/package.json @@ -0,0 +1,5 @@ +{ + "name": "sveltekit-actions-lib", + "main": "server.js", + "devDependencies": { "@sveltejs/kit": "^2.5.0" } +} diff --git a/test/projectgraph/cases/javascript/sveltekit-actions-lib/project/server.js b/test/projectgraph/cases/javascript/sveltekit-actions-lib/project/server.js new file mode 100644 index 00000000..fc1cd6f8 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-actions-lib/project/server.js @@ -0,0 +1,3 @@ +import { listen } from 'plug'; + +listen(3000); diff --git a/test/projectgraph/cases/javascript/sveltekit-actions-lib/project/src/lib/helper.js b/test/projectgraph/cases/javascript/sveltekit-actions-lib/project/src/lib/helper.js new file mode 100644 index 00000000..099b4c6b --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-actions-lib/project/src/lib/helper.js @@ -0,0 +1,5 @@ +import { c1 } from 'plug'; + +export function helper() { + return c1(); +} diff --git a/test/projectgraph/cases/javascript/sveltekit-actions-lib/project/src/routes/api/+server.js b/test/projectgraph/cases/javascript/sveltekit-actions-lib/project/src/routes/api/+server.js new file mode 100644 index 00000000..50167b76 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-actions-lib/project/src/routes/api/+server.js @@ -0,0 +1,5 @@ +import { helper } from '$lib/helper'; + +export function POST() { + return helper(); +} diff --git a/test/projectgraph/cases/javascript/sveltekit-actions-lib/project/src/routes/form/+page.server.ts b/test/projectgraph/cases/javascript/sveltekit-actions-lib/project/src/routes/form/+page.server.ts new file mode 100644 index 00000000..a313b363 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-actions-lib/project/src/routes/form/+page.server.ts @@ -0,0 +1,13 @@ +import { a1, a2, a7 } from 'plug'; + +export const actions = { + default: async ({ request }) => { + a1(request); + }, + save({ request }) { + function unused() { + a7(); + } + a2(request); + }, +}; diff --git a/test/projectgraph/cases/javascript/sveltekit-actions-lib/project/src/routes/items/+page.server.ts b/test/projectgraph/cases/javascript/sveltekit-actions-lib/project/src/routes/items/+page.server.ts new file mode 100644 index 00000000..e0e18dd3 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-actions-lib/project/src/routes/items/+page.server.ts @@ -0,0 +1,8 @@ +import type { Actions } from './$types'; +import { a6 } from 'plug'; + +export const actions = { + default: async () => { + a6(); + }, +} satisfies Actions; diff --git a/test/projectgraph/cases/javascript/sveltekit-destructured-export/expect.yaml b/test/projectgraph/cases/javascript/sveltekit-destructured-export/expect.yaml new file mode 100644 index 00000000..2a647d36 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-destructured-export/expect.yaml @@ -0,0 +1,107 @@ +source: safedep:hand +description: >- + The route file exports GET, PUT and POST by a destructuring declaration from the object handlers, and + fallback from the array fallbacks. The index gives each name an export record whose target is the member + that it takes, as handlers//rest//PUT for PUT in { rest: { PUT } }, and POST for the rename post: POST. + A name of an array pattern takes the array. So the rule node.sveltekit.route marks each function, and + a1, a2 and a3 are found. The function of fallbacks runs its call in the module top level, so a4 is found. +roots: + - key: server.js + kind: manifest + rule: node.package-json + - key: src/routes/api/+server.ts + kind: framework + rule: node.sveltekit.route + - key: src/routes/api/+server.ts//fallbacks + kind: framework + rule: node.sveltekit.route + - key: src/routes/api/+server.ts//handlers//GET + kind: framework + rule: node.sveltekit.route + - key: src/routes/api/+server.ts//handlers//post + kind: framework + rule: node.sveltekit.route + - key: src/routes/api/+server.ts//handlers//rest//PUT + kind: framework + rule: node.sveltekit.route +exact_edges: true +edges: + - from: server.js + to: plug//listen + kind: direct + confidence: high + site: server.js:3 + - from: src/routes/api/+server.ts + to: plug//a4 + kind: direct + confidence: high + site: src/routes/api/+server.ts:10 + - from: src/routes/api/+server.ts//handlers//GET + to: plug//a1 + kind: direct + confidence: high + site: src/routes/api/+server.ts:4 + - from: src/routes/api/+server.ts//handlers//post + to: plug//a3 + kind: direct + confidence: high + site: src/routes/api/+server.ts:7 + - from: src/routes/api/+server.ts//handlers//rest//PUT + to: plug//a2 + kind: direct + confidence: high + site: src/routes/api/+server.ts:5 +unresolved: [] +results: + - target: plug//a1 + status: found + path: + - key: src/routes/api/+server.ts//handlers//GET + root: framework + - key: plug//a1 + site: src/routes/api/+server.ts:4 + kind: direct + confidence: high + call_sites: + - caller: src/routes/api/+server.ts//handlers//GET + site: src/routes/api/+server.ts:4 + reached: true + - target: plug//a2 + status: found + path: + - key: src/routes/api/+server.ts//handlers//rest//PUT + root: framework + - key: plug//a2 + site: src/routes/api/+server.ts:5 + kind: direct + confidence: high + call_sites: + - caller: src/routes/api/+server.ts//handlers//rest//PUT + site: src/routes/api/+server.ts:5 + reached: true + - target: plug//a3 + status: found + path: + - key: src/routes/api/+server.ts//handlers//post + root: framework + - key: plug//a3 + site: src/routes/api/+server.ts:7 + kind: direct + confidence: high + call_sites: + - caller: src/routes/api/+server.ts//handlers//post + site: src/routes/api/+server.ts:7 + reached: true + - target: plug//a4 + status: found + path: + - key: src/routes/api/+server.ts + root: framework + - key: plug//a4 + site: src/routes/api/+server.ts:10 + kind: direct + confidence: high + call_sites: + - caller: src/routes/api/+server.ts + site: src/routes/api/+server.ts:10 + reached: true diff --git a/test/projectgraph/cases/javascript/sveltekit-destructured-export/project/package.json b/test/projectgraph/cases/javascript/sveltekit-destructured-export/project/package.json new file mode 100644 index 00000000..068b7a75 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-destructured-export/project/package.json @@ -0,0 +1,5 @@ +{ + "name": "sveltekit-destructured-export", + "main": "server.js", + "devDependencies": { "@sveltejs/kit": "^2.5.0" } +} diff --git a/test/projectgraph/cases/javascript/sveltekit-destructured-export/project/server.js b/test/projectgraph/cases/javascript/sveltekit-destructured-export/project/server.js new file mode 100644 index 00000000..fc1cd6f8 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-destructured-export/project/server.js @@ -0,0 +1,3 @@ +import { listen } from 'plug'; + +listen(3000); diff --git a/test/projectgraph/cases/javascript/sveltekit-destructured-export/project/src/routes/api/+server.ts b/test/projectgraph/cases/javascript/sveltekit-destructured-export/project/src/routes/api/+server.ts new file mode 100644 index 00000000..c8eccbe1 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-destructured-export/project/src/routes/api/+server.ts @@ -0,0 +1,13 @@ +import { a1, a2, a3, a4 } from 'plug'; + +const handlers = { + GET: async () => a1(), + rest: { PUT: async () => a2() }, + post() { + a3(); + }, +}; +const fallbacks = [async () => a4()]; + +export const { GET, rest: { PUT }, post: POST } = handlers; +export const [fallback] = fallbacks; diff --git a/test/projectgraph/cases/javascript/sveltekit-lib-moved/expect.yaml b/test/projectgraph/cases/javascript/sveltekit-lib-moved/expect.yaml new file mode 100644 index 00000000..dbd11fe4 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-lib-moved/expect.yaml @@ -0,0 +1,46 @@ +source: safedep:hand +description: >- + svelte.config.js moves the library directory of SvelteKit to src/library, and the resolver does not read + it. So $lib/helper names no file. The alias $lib names a directory of the project, so the import is a + record with the reason no-definition and not an external key, and c1 reads uncertain and not not-found. +roots: + - key: server.js + kind: manifest + rule: node.package-json + - key: src/routes/api/+server.js + kind: framework + rule: node.sveltekit.route + - key: src/routes/api/+server.js//POST + kind: framework + rule: node.sveltekit.route +exact_edges: true +edges: + - from: server.js + to: plug//listen + kind: direct + confidence: high + site: server.js:3 + - from: src/library/helper.js//helper + to: plug//c1 + kind: direct + confidence: high + site: src/library/helper.js:4 + - from: src/routes/api/+server.js//POST + to: $lib//helper//helper + kind: direct + confidence: high + site: src/routes/api/+server.js:4 +unresolved: + - caller: src/routes/api/+server.js + site: src/routes/api/+server.js:1 + reason: no-definition +results: + - target: plug//c1 + status: uncertain + call_sites: + - caller: src/library/helper.js//helper + site: src/library/helper.js:4 + reached: false + uncertainties: + - kind: unresolved-call + site: src/routes/api/+server.js:1 diff --git a/test/projectgraph/cases/javascript/sveltekit-lib-moved/project/package.json b/test/projectgraph/cases/javascript/sveltekit-lib-moved/project/package.json new file mode 100644 index 00000000..444b1f88 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-lib-moved/project/package.json @@ -0,0 +1,5 @@ +{ + "name": "sveltekit-lib-moved", + "main": "server.js", + "devDependencies": { "@sveltejs/kit": "^2.5.0" } +} diff --git a/test/projectgraph/cases/javascript/sveltekit-lib-moved/project/server.js b/test/projectgraph/cases/javascript/sveltekit-lib-moved/project/server.js new file mode 100644 index 00000000..fc1cd6f8 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-lib-moved/project/server.js @@ -0,0 +1,3 @@ +import { listen } from 'plug'; + +listen(3000); diff --git a/test/projectgraph/cases/javascript/sveltekit-lib-moved/project/src/library/helper.js b/test/projectgraph/cases/javascript/sveltekit-lib-moved/project/src/library/helper.js new file mode 100644 index 00000000..099b4c6b --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-lib-moved/project/src/library/helper.js @@ -0,0 +1,5 @@ +import { c1 } from 'plug'; + +export function helper() { + return c1(); +} diff --git a/test/projectgraph/cases/javascript/sveltekit-lib-moved/project/src/routes/api/+server.js b/test/projectgraph/cases/javascript/sveltekit-lib-moved/project/src/routes/api/+server.js new file mode 100644 index 00000000..50167b76 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-lib-moved/project/src/routes/api/+server.js @@ -0,0 +1,5 @@ +import { helper } from '$lib/helper'; + +export function POST() { + return helper(); +} diff --git a/test/projectgraph/cases/javascript/sveltekit-lib-moved/project/svelte.config.js b/test/projectgraph/cases/javascript/sveltekit-lib-moved/project/svelte.config.js new file mode 100644 index 00000000..43fcf186 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-lib-moved/project/svelte.config.js @@ -0,0 +1 @@ +export default { kit: { files: { lib: 'src/library' } } }; diff --git a/test/projectgraph/cases/javascript/sveltekit-opaque-exports/expect.yaml b/test/projectgraph/cases/javascript/sveltekit-opaque-exports/expect.yaml new file mode 100644 index 00000000..bae1ff91 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-opaque-exports/expect.yaml @@ -0,0 +1,207 @@ +source: safedep:hand +description: >- + The route files export values that are no object literal. handle is the result of sequence, and the + index records the arguments first and second of the call in the export statement as references, so + h1 and h2 are found. other names the variable named, which holds table, so the export reaches table and + the rule marks save. PUT takes the default fallback, because handlers has no PUT. GET and actions are + results of calls, and the functions that the framework calls on them are no definition that an edge + names. So each of the two exports gets a computed-name record in place of a root, and a1 and a4 read + uncertain and not not-found. +roots: + - key: server.js + kind: manifest + rule: node.package-json + - key: src/hooks.server.ts + kind: framework + rule: node.sveltekit.route + - key: src/hooks.server.ts//handle + kind: framework + rule: node.sveltekit.route + - key: src/routes/a/+server.ts + kind: framework + rule: node.sveltekit.route + - key: src/routes/a/+server.ts//fallback + kind: framework + rule: node.sveltekit.route + - key: src/routes/b/+page.server.ts + kind: framework + rule: node.sveltekit.route + - key: src/routes/b/+page.server.ts//actions + kind: framework + rule: node.sveltekit.route + - key: src/routes/b/+page.server.ts//named + kind: framework + rule: node.sveltekit.route + - key: src/routes/b/+page.server.ts//table + kind: framework + rule: node.sveltekit.route + - key: src/routes/b/+page.server.ts//table//save + kind: framework + rule: node.sveltekit.route +exact_edges: true +edges: + - from: server.js + to: plug//listen + kind: direct + confidence: high + site: server.js:3 + - from: src/hooks.server.ts + to: "@sveltejs//kit//hooks//sequence" + kind: direct + confidence: high + site: src/hooks.server.ts:14 + - from: src/hooks.server.ts + to: src/hooks.server.ts//first + kind: reference + confidence: low + site: src/hooks.server.ts:14 + - from: src/hooks.server.ts + to: src/hooks.server.ts//second + kind: reference + confidence: low + site: src/hooks.server.ts:14 + - from: src/hooks.server.ts//first + to: plug//h1 + kind: direct + confidence: high + site: src/hooks.server.ts:5 + - from: src/hooks.server.ts//second + to: plug//h2 + kind: direct + confidence: high + site: src/hooks.server.ts:10 + - from: src/routes/a/+server.ts + to: src/routes/a/+server.ts//make + kind: direct + confidence: high + site: src/routes/a/+server.ts:7 + - from: src/routes/a/+server.ts//fallback + to: plug//a3 + kind: direct + confidence: high + site: src/routes/a/+server.ts:9 + - from: src/routes/a/+server.ts//make//GET + to: plug//a1 + kind: direct + confidence: high + site: src/routes/a/+server.ts:4 + - from: src/routes/b/+page.server.ts + to: src/routes/b/+page.server.ts//makeActions + kind: direct + confidence: high + site: src/routes/b/+page.server.ts:7 + - from: src/routes/b/+page.server.ts//makeActions//default + to: plug//a4 + kind: direct + confidence: high + site: src/routes/b/+page.server.ts:4 + - from: src/routes/b/+page.server.ts//table//save + to: plug//a5 + kind: direct + confidence: high + site: src/routes/b/+page.server.ts:9 +unresolved: + - caller: src/hooks.server.ts//first + site: src/hooks.server.ts:6 + reason: unknown-receiver + method: resolve + - caller: src/hooks.server.ts//second + site: src/hooks.server.ts:11 + reason: unknown-receiver + method: resolve + - caller: src/hooks.server.ts + site: src/hooks.server.ts:14 + reason: computed-name + - caller: src/routes/a/+server.ts + site: src/routes/a/+server.ts:7 + reason: computed-name + - caller: src/routes/b/+page.server.ts + site: src/routes/b/+page.server.ts:7 + reason: computed-name +results: + - target: plug//h1 + status: found + path: + - key: src/hooks.server.ts + root: framework + - key: src/hooks.server.ts//first + site: src/hooks.server.ts:14 + kind: reference + confidence: low + - key: plug//h1 + site: src/hooks.server.ts:5 + kind: direct + confidence: high + call_sites: + - caller: src/hooks.server.ts//first + site: src/hooks.server.ts:5 + reached: true + - target: plug//h2 + status: found + path: + - key: src/hooks.server.ts + root: framework + - key: src/hooks.server.ts//second + site: src/hooks.server.ts:14 + kind: reference + confidence: low + - key: plug//h2 + site: src/hooks.server.ts:10 + kind: direct + confidence: high + call_sites: + - caller: src/hooks.server.ts//second + site: src/hooks.server.ts:10 + reached: true + - target: plug//a1 + status: uncertain + call_sites: + - caller: src/routes/a/+server.ts//make//GET + site: src/routes/a/+server.ts:4 + reached: false + uncertainties: + - kind: unresolved-call + site: src/hooks.server.ts:14 + - kind: unresolved-call + site: src/routes/a/+server.ts:7 + - kind: unresolved-call + site: src/routes/b/+page.server.ts:7 + - target: plug//a3 + status: found + path: + - key: src/routes/a/+server.ts//fallback + root: framework + - key: plug//a3 + site: src/routes/a/+server.ts:9 + kind: direct + confidence: high + call_sites: + - caller: src/routes/a/+server.ts//fallback + site: src/routes/a/+server.ts:9 + reached: true + - target: plug//a4 + status: uncertain + call_sites: + - caller: src/routes/b/+page.server.ts//makeActions//default + site: src/routes/b/+page.server.ts:4 + reached: false + uncertainties: + - kind: unresolved-call + site: src/hooks.server.ts:14 + - kind: unresolved-call + site: src/routes/a/+server.ts:7 + - kind: unresolved-call + site: src/routes/b/+page.server.ts:7 + - target: plug//a5 + status: found + path: + - key: src/routes/b/+page.server.ts//table//save + root: framework + - key: plug//a5 + site: src/routes/b/+page.server.ts:9 + kind: direct + confidence: high + call_sites: + - caller: src/routes/b/+page.server.ts//table//save + site: src/routes/b/+page.server.ts:9 + reached: true diff --git a/test/projectgraph/cases/javascript/sveltekit-opaque-exports/project/package.json b/test/projectgraph/cases/javascript/sveltekit-opaque-exports/project/package.json new file mode 100644 index 00000000..6d911bbb --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-opaque-exports/project/package.json @@ -0,0 +1,5 @@ +{ + "name": "sveltekit-opaque-exports", + "main": "server.js", + "devDependencies": { "@sveltejs/kit": "^2.5.0" } +} diff --git a/test/projectgraph/cases/javascript/sveltekit-opaque-exports/project/server.js b/test/projectgraph/cases/javascript/sveltekit-opaque-exports/project/server.js new file mode 100644 index 00000000..fc1cd6f8 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-opaque-exports/project/server.js @@ -0,0 +1,3 @@ +import { listen } from 'plug'; + +listen(3000); diff --git a/test/projectgraph/cases/javascript/sveltekit-opaque-exports/project/src/hooks.server.ts b/test/projectgraph/cases/javascript/sveltekit-opaque-exports/project/src/hooks.server.ts new file mode 100644 index 00000000..37132cb0 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-opaque-exports/project/src/hooks.server.ts @@ -0,0 +1,14 @@ +import { sequence } from '@sveltejs/kit/hooks'; +import { h1, h2 } from 'plug'; + +const first = async ({ event, resolve }) => { + h1(); + return resolve(event); +}; + +async function second({ event, resolve }) { + h2(); + return resolve(event); +} + +export const handle = sequence(first, second); diff --git a/test/projectgraph/cases/javascript/sveltekit-opaque-exports/project/src/routes/a/+server.ts b/test/projectgraph/cases/javascript/sveltekit-opaque-exports/project/src/routes/a/+server.ts new file mode 100644 index 00000000..46e7b0cc --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-opaque-exports/project/src/routes/a/+server.ts @@ -0,0 +1,12 @@ +import { a1, a3 } from 'plug'; + +function make() { + return { GET() { a1(); } }; +} + +export const { GET } = make(); + +const fallback = () => a3(); +const handlers = {}; + +export const { PUT = fallback } = handlers; diff --git a/test/projectgraph/cases/javascript/sveltekit-opaque-exports/project/src/routes/b/+page.server.ts b/test/projectgraph/cases/javascript/sveltekit-opaque-exports/project/src/routes/b/+page.server.ts new file mode 100644 index 00000000..fbffba0a --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-opaque-exports/project/src/routes/b/+page.server.ts @@ -0,0 +1,12 @@ +import { a4, a5 } from 'plug'; + +function makeActions() { + return { default: async () => a4() }; +} + +export const actions = makeActions(); + +const table = { save: async () => a5() }; +const named = table; + +export { named as other }; diff --git a/test/projectgraph/cases/javascript/sveltekit-routes/expect.yaml b/test/projectgraph/cases/javascript/sveltekit-routes/expect.yaml new file mode 100644 index 00000000..5b5997b6 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-routes/expect.yaml @@ -0,0 +1,121 @@ +source: safedep:hand +description: >- + SvelteKit loads the files of src/routes by their names, and no file imports them. Each component file + is a root of the rule node.component. The rule node.sveltekit.route marks each route file and its + exports, so load of +page.ts and POST of +server.ts are roots too, and store and fetchData are found + and not only uncertain by the markup records. +roots: + - key: server.js + kind: manifest + rule: node.package-json + - key: src/routes/+layout.svelte + kind: framework + rule: node.component + - key: src/routes/+layout.svelte + kind: framework + rule: node.sveltekit.route + - key: src/routes/+page.svelte + kind: framework + rule: node.component + - key: src/routes/+page.svelte + kind: framework + rule: node.sveltekit.route + - key: src/routes/+page.ts + kind: framework + rule: node.sveltekit.route + - key: src/routes/+page.ts//load + kind: framework + rule: node.sveltekit.route + - key: src/routes/api/+server.ts + kind: framework + rule: node.sveltekit.route + - key: src/routes/api/+server.ts//POST + kind: framework + rule: node.sveltekit.route +exact_edges: true +edges: + - from: server.js + to: plug//listen + kind: direct + confidence: high + site: server.js:3 + - from: src/routes/+layout.svelte + to: plug//frame + kind: direct + confidence: high + site: src/routes/+layout.svelte:3 + - from: src/routes/+page.svelte + to: plug//danger + kind: direct + confidence: high + site: src/routes/+page.svelte:3 + - from: src/routes/+page.ts//load + to: plug//fetchData + kind: direct + confidence: high + site: src/routes/+page.ts:4 + - from: src/routes/api/+server.ts//POST + to: plug//store + kind: direct + confidence: high + site: src/routes/api/+server.ts:4 +unresolved: + - caller: src/routes/+layout.svelte + site: src/routes/+layout.svelte:1 + reason: markup + - caller: src/routes/+page.svelte + site: src/routes/+page.svelte:1 + reason: markup +results: + - target: plug//danger + status: found + path: + - key: src/routes/+page.svelte + root: framework + - key: plug//danger + site: src/routes/+page.svelte:3 + kind: direct + confidence: high + call_sites: + - caller: src/routes/+page.svelte + site: src/routes/+page.svelte:3 + reached: true + - target: plug//frame + status: found + path: + - key: src/routes/+layout.svelte + root: framework + - key: plug//frame + site: src/routes/+layout.svelte:3 + kind: direct + confidence: high + call_sites: + - caller: src/routes/+layout.svelte + site: src/routes/+layout.svelte:3 + reached: true + - target: plug//fetchData + status: found + path: + - key: src/routes/+page.ts//load + root: framework + - key: plug//fetchData + site: src/routes/+page.ts:4 + kind: direct + confidence: high + call_sites: + - caller: src/routes/+page.ts//load + site: src/routes/+page.ts:4 + reached: true + - target: plug//store + status: found + path: + - key: src/routes/api/+server.ts//POST + root: framework + - key: plug//store + site: src/routes/api/+server.ts:4 + kind: direct + confidence: high + call_sites: + - caller: src/routes/api/+server.ts//POST + site: src/routes/api/+server.ts:4 + reached: true diff --git a/test/projectgraph/cases/javascript/sveltekit-routes/project/package.json b/test/projectgraph/cases/javascript/sveltekit-routes/project/package.json new file mode 100644 index 00000000..da1b56d0 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-routes/project/package.json @@ -0,0 +1,5 @@ +{ + "name": "sveltekit-routes", + "main": "server.js", + "devDependencies": { "@sveltejs/kit": "^2.5.0", "svelte": "^4.2.0" } +} diff --git a/test/projectgraph/cases/javascript/sveltekit-routes/project/server.js b/test/projectgraph/cases/javascript/sveltekit-routes/project/server.js new file mode 100644 index 00000000..fc1cd6f8 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-routes/project/server.js @@ -0,0 +1,3 @@ +import { listen } from 'plug'; + +listen(3000); diff --git a/test/projectgraph/cases/javascript/sveltekit-routes/project/src/routes/+layout.svelte b/test/projectgraph/cases/javascript/sveltekit-routes/project/src/routes/+layout.svelte new file mode 100644 index 00000000..a5974fc3 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-routes/project/src/routes/+layout.svelte @@ -0,0 +1,6 @@ + + + diff --git a/test/projectgraph/cases/javascript/sveltekit-routes/project/src/routes/+page.svelte b/test/projectgraph/cases/javascript/sveltekit-routes/project/src/routes/+page.svelte new file mode 100644 index 00000000..bdb3e7fa --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-routes/project/src/routes/+page.svelte @@ -0,0 +1,6 @@ + + +

home

diff --git a/test/projectgraph/cases/javascript/sveltekit-routes/project/src/routes/+page.ts b/test/projectgraph/cases/javascript/sveltekit-routes/project/src/routes/+page.ts new file mode 100644 index 00000000..1cea69c2 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-routes/project/src/routes/+page.ts @@ -0,0 +1,5 @@ +import { fetchData } from 'plug'; + +export function load() { + return fetchData(); +} diff --git a/test/projectgraph/cases/javascript/sveltekit-routes/project/src/routes/api/+server.ts b/test/projectgraph/cases/javascript/sveltekit-routes/project/src/routes/api/+server.ts new file mode 100644 index 00000000..5b0d767b --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-routes/project/src/routes/api/+server.ts @@ -0,0 +1,5 @@ +import { store } from 'plug'; + +export function POST() { + return store(); +} diff --git a/test/projectgraph/cases/javascript/sveltekit-test-dir/expect.yaml b/test/projectgraph/cases/javascript/sveltekit-test-dir/expect.yaml new file mode 100644 index 00000000..0dc2b80e --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-test-dir/expect.yaml @@ -0,0 +1,76 @@ +source: safedep:hand +description: >- + A route of the app has a path under a test path, as src/routes/api/test or src/routes/tests. The + route rule names its files by their path in the app, so it marks them although they are test files, + and probe and render are found. Only the rule node.component skips a file of a test path. +test_paths: [test, tests, spec] +roots: + - key: server.js + kind: manifest + rule: node.package-json + - key: src/routes/api/test/+server.ts + kind: framework + rule: node.sveltekit.route + - key: src/routes/api/test/+server.ts + kind: test + rule: test.files + - key: src/routes/api/test/+server.ts//GET + kind: framework + rule: node.sveltekit.route + - key: src/routes/api/test/+server.ts//GET + kind: test + rule: test.files + - key: src/routes/tests/+page.svelte + kind: framework + rule: node.sveltekit.route + - key: src/routes/tests/+page.svelte + kind: test + rule: test.files +exact_edges: true +edges: + - from: server.js + to: plug//listen + kind: direct + confidence: high + site: server.js:3 + - from: src/routes/api/test/+server.ts//GET + to: plug//probe + kind: direct + confidence: high + site: src/routes/api/test/+server.ts:4 + - from: src/routes/tests/+page.svelte + to: plug//render + kind: direct + confidence: high + site: src/routes/tests/+page.svelte:3 +unresolved: + - caller: src/routes/tests/+page.svelte + site: src/routes/tests/+page.svelte:1 + reason: markup +results: + - target: plug//probe + status: found + path: + - key: src/routes/api/test/+server.ts//GET + root: framework + - key: plug//probe + site: src/routes/api/test/+server.ts:4 + kind: direct + confidence: high + call_sites: + - caller: src/routes/api/test/+server.ts//GET + site: src/routes/api/test/+server.ts:4 + reached: true + - target: plug//render + status: found + path: + - key: src/routes/tests/+page.svelte + root: framework + - key: plug//render + site: src/routes/tests/+page.svelte:3 + kind: direct + confidence: high + call_sites: + - caller: src/routes/tests/+page.svelte + site: src/routes/tests/+page.svelte:3 + reached: true diff --git a/test/projectgraph/cases/javascript/sveltekit-test-dir/project/package.json b/test/projectgraph/cases/javascript/sveltekit-test-dir/project/package.json new file mode 100644 index 00000000..8a00bac4 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-test-dir/project/package.json @@ -0,0 +1 @@ +{ "name": "sveltekit-test-dir", "main": "server.js", "devDependencies": { "@sveltejs/kit": "^2.5.0" } } diff --git a/test/projectgraph/cases/javascript/sveltekit-test-dir/project/server.js b/test/projectgraph/cases/javascript/sveltekit-test-dir/project/server.js new file mode 100644 index 00000000..fc1cd6f8 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-test-dir/project/server.js @@ -0,0 +1,3 @@ +import { listen } from 'plug'; + +listen(3000); diff --git a/test/projectgraph/cases/javascript/sveltekit-test-dir/project/src/routes/api/test/+server.ts b/test/projectgraph/cases/javascript/sveltekit-test-dir/project/src/routes/api/test/+server.ts new file mode 100644 index 00000000..4dd9311e --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-test-dir/project/src/routes/api/test/+server.ts @@ -0,0 +1,5 @@ +import { probe } from 'plug'; + +export function GET() { + return probe(); +} diff --git a/test/projectgraph/cases/javascript/sveltekit-test-dir/project/src/routes/tests/+page.svelte b/test/projectgraph/cases/javascript/sveltekit-test-dir/project/src/routes/tests/+page.svelte new file mode 100644 index 00000000..875bb221 --- /dev/null +++ b/test/projectgraph/cases/javascript/sveltekit-test-dir/project/src/routes/tests/+page.svelte @@ -0,0 +1,6 @@ + + +

tests

diff --git a/test/projectgraph/cases/javascript/vue-alias-import/expect.yaml b/test/projectgraph/cases/javascript/vue-alias-import/expect.yaml new file mode 100644 index 00000000..44e1159f --- /dev/null +++ b/test/projectgraph/cases/javascript/vue-alias-import/expect.yaml @@ -0,0 +1,56 @@ +source: safedep:hand +description: >- + main.js imports Panel.vue by the alias @/ of the bundler, and the project has no tsconfig paths, so the + import names an external key and no path leads to Panel.vue. Each component file is a root of the rule + node.component, so the call of danger in the script of Panel.vue is found. +roots: + - key: src/components/Panel.vue + kind: framework + rule: node.component + - key: src/main.js + kind: manifest + rule: node.package-json +exact_edges: true +edges: + - from: src/components/Panel.vue + to: plug//danger + kind: direct + confidence: high + site: src/components/Panel.vue:4 + - from: src/main.js + to: vue//createApp + kind: direct + confidence: high + site: src/main.js:4 + - from: src/main.js + to: vue//createApp//mount + kind: direct + confidence: high + site: src/main.js:4 + - from: src/main.js + to: "@//components//Panel.vue" + kind: reference + confidence: low + site: src/main.js:4 +unresolved: + - caller: src/components/Panel.vue + site: src/components/Panel.vue:1 + reason: markup + - caller: src/main.js + site: src/main.js:4 + reason: no-dependency-source + method: mount +results: + - target: plug//danger + status: found + path: + - key: src/components/Panel.vue + root: framework + - key: plug//danger + site: src/components/Panel.vue:4 + kind: direct + confidence: high + call_sites: + - caller: src/components/Panel.vue + site: src/components/Panel.vue:4 + reached: true diff --git a/test/projectgraph/cases/javascript/vue-alias-import/project/package.json b/test/projectgraph/cases/javascript/vue-alias-import/project/package.json new file mode 100644 index 00000000..e9d60369 --- /dev/null +++ b/test/projectgraph/cases/javascript/vue-alias-import/project/package.json @@ -0,0 +1,5 @@ +{ + "name": "vue-alias-import", + "main": "src/main.js", + "dependencies": { "vue": "^3.4.0" } +} diff --git a/test/projectgraph/cases/javascript/vue-alias-import/project/src/components/Panel.vue b/test/projectgraph/cases/javascript/vue-alias-import/project/src/components/Panel.vue new file mode 100644 index 00000000..87537a4f --- /dev/null +++ b/test/projectgraph/cases/javascript/vue-alias-import/project/src/components/Panel.vue @@ -0,0 +1,9 @@ + + + diff --git a/test/projectgraph/cases/javascript/vue-alias-import/project/src/main.js b/test/projectgraph/cases/javascript/vue-alias-import/project/src/main.js new file mode 100644 index 00000000..000dc0df --- /dev/null +++ b/test/projectgraph/cases/javascript/vue-alias-import/project/src/main.js @@ -0,0 +1,4 @@ +import { createApp } from 'vue'; +import Panel from '@/components/Panel.vue'; + +createApp(Panel).mount('#app'); diff --git a/test/projectgraph/cases/javascript/vue-import-meta-glob/expect.yaml b/test/projectgraph/cases/javascript/vue-import-meta-glob/expect.yaml new file mode 100644 index 00000000..99876d8a --- /dev/null +++ b/test/projectgraph/cases/javascript/vue-import-meta-glob/expect.yaml @@ -0,0 +1,66 @@ +source: safedep:hand +description: >- + main.js loads each page of src/pages by import.meta.glob, which the index does not read, so no path + leads to About.vue. Each component file is a root of the rule node.component, so the call of danger in + the script of About.vue is found. +roots: + - key: src/main.js + kind: manifest + rule: node.package-json + - key: src/pages/About.vue + kind: framework + rule: node.component +exact_edges: true +edges: + - from: src/main.js + to: vue//createApp + kind: direct + confidence: high + site: src/main.js:4 + - from: src/main.js + to: Object//entries + kind: direct + confidence: high + site: src/main.js:5 + - from: src/main.js + to: vue//createApp//component + kind: direct + confidence: high + site: src/main.js:6 + - from: src/main.js + to: vue//defineAsyncComponent + kind: direct + confidence: high + site: src/main.js:6 + - from: src/main.js + to: vue//createApp//mount + kind: direct + confidence: high + site: src/main.js:8 + - from: src/pages/About.vue + to: plug//danger + kind: direct + confidence: high + site: src/pages/About.vue:4 +unresolved: + - caller: src/main.js + site: src/main.js:3 + reason: unknown-receiver + method: glob + - caller: src/pages/About.vue + site: src/pages/About.vue:1 + reason: markup +results: + - target: plug//danger + status: found + path: + - key: src/pages/About.vue + root: framework + - key: plug//danger + site: src/pages/About.vue:4 + kind: direct + confidence: high + call_sites: + - caller: src/pages/About.vue + site: src/pages/About.vue:4 + reached: true diff --git a/test/projectgraph/cases/javascript/vue-import-meta-glob/project/package.json b/test/projectgraph/cases/javascript/vue-import-meta-glob/project/package.json new file mode 100644 index 00000000..55893cc5 --- /dev/null +++ b/test/projectgraph/cases/javascript/vue-import-meta-glob/project/package.json @@ -0,0 +1,5 @@ +{ + "name": "vue-import-meta-glob", + "main": "src/main.js", + "dependencies": { "vue": "^3.4.0" } +} diff --git a/test/projectgraph/cases/javascript/vue-import-meta-glob/project/src/main.js b/test/projectgraph/cases/javascript/vue-import-meta-glob/project/src/main.js new file mode 100644 index 00000000..d2ec149b --- /dev/null +++ b/test/projectgraph/cases/javascript/vue-import-meta-glob/project/src/main.js @@ -0,0 +1,8 @@ +import { createApp, defineAsyncComponent } from 'vue'; + +const pages = import.meta.glob('./pages/*.vue'); +const app = createApp({}); +for (const [path, load] of Object.entries(pages)) { + app.component(path, defineAsyncComponent(load)); +} +app.mount('#app'); diff --git a/test/projectgraph/cases/javascript/vue-import-meta-glob/project/src/pages/About.vue b/test/projectgraph/cases/javascript/vue-import-meta-glob/project/src/pages/About.vue new file mode 100644 index 00000000..220168de --- /dev/null +++ b/test/projectgraph/cases/javascript/vue-import-meta-glob/project/src/pages/About.vue @@ -0,0 +1,9 @@ + + + diff --git a/test/projectgraph/cases/javascript/vue-options-api/expect.yaml b/test/projectgraph/cases/javascript/vue-options-api/expect.yaml index 3ff5fd4a..cbe23b23 100644 --- a/test/projectgraph/cases/javascript/vue-options-api/expect.yaml +++ b/test/projectgraph/cases/javascript/vue-options-api/expect.yaml @@ -1,6 +1,12 @@ source: safedep:hand description: Vue calls the methods and the hooks of the options object of a component. No code of the project calls go of Opt.vue or mounted of Hooks.vue. Hooks.vue has no template, and it still has a markup record, so hdanger reads uncertain and not not-found. roots: + - key: src/Hooks.vue + kind: framework + rule: node.component + - key: src/Opt.vue + kind: framework + rule: node.component - key: src/main.js kind: manifest rule: node.package-json @@ -51,10 +57,10 @@ results: site: src/Opt.vue:11 reached: false uncertainties: - - kind: unresolved-call - site: src/Opt.vue:1 - kind: unresolved-call site: src/Hooks.vue:1 + - kind: unresolved-call + site: src/Opt.vue:1 - target: plug//hdanger status: uncertain call_sites: @@ -62,7 +68,7 @@ results: site: src/Hooks.vue:6 reached: false uncertainties: - - kind: unresolved-call - site: src/Opt.vue:1 - kind: unresolved-call site: src/Hooks.vue:1 + - kind: unresolved-call + site: src/Opt.vue:1 diff --git a/test/projectgraph/cases/javascript/vue-route-dynamic-import/expect.yaml b/test/projectgraph/cases/javascript/vue-route-dynamic-import/expect.yaml new file mode 100644 index 00000000..da290c03 --- /dev/null +++ b/test/projectgraph/cases/javascript/vue-route-dynamic-import/expect.yaml @@ -0,0 +1,90 @@ +source: safedep:hand +description: >- + The route table of router.js loads Home.vue by a dynamic import in an arrow function that vue-router + calls. No code of the graph calls the arrow function, so no path leads to Home.vue. Each component file + is a root of the rule node.component, so the call of danger in the script of Home.vue is found. +roots: + - key: src/main.js + kind: manifest + rule: node.package-json + - key: src/views/Home.vue + kind: framework + rule: node.component +exact_edges: true +edges: + - from: src/main.js + to: src/router.js + kind: import + confidence: high + site: src/main.js:3 + - from: src/main.js + to: vue//createApp + kind: direct + confidence: high + site: src/main.js:5 + - from: src/main.js + to: vue//createApp//use + kind: direct + confidence: high + site: src/main.js:5 + - from: src/main.js + to: vue//createApp//use//mount + kind: direct + confidence: high + site: src/main.js:5 + - from: src/main.js//render + to: vue//h + kind: direct + confidence: high + site: src/main.js:5 + - from: src/main.js//render + to: vue-router//RouterView + kind: reference + confidence: low + site: src/main.js:5 + - from: src/router.js + to: vue-router//createRouter + kind: direct + confidence: high + site: src/router.js:7 + - from: src/router.js + to: vue-router//createWebHistory + kind: direct + confidence: high + site: src/router.js:7 + - from: src/router.js//component + to: src/views/Home.vue + kind: import + confidence: high + site: src/router.js:4 + - from: src/views/Home.vue + to: plug//danger + kind: direct + confidence: high + site: src/views/Home.vue:4 +unresolved: + - caller: src/main.js + site: src/main.js:5 + reason: no-dependency-source + method: use + - caller: src/main.js + site: src/main.js:5 + reason: no-dependency-source + method: mount + - caller: src/views/Home.vue + site: src/views/Home.vue:1 + reason: markup +results: + - target: plug//danger + status: found + path: + - key: src/views/Home.vue + root: framework + - key: plug//danger + site: src/views/Home.vue:4 + kind: direct + confidence: high + call_sites: + - caller: src/views/Home.vue + site: src/views/Home.vue:4 + reached: true diff --git a/test/projectgraph/cases/javascript/vue-route-dynamic-import/project/package.json b/test/projectgraph/cases/javascript/vue-route-dynamic-import/project/package.json new file mode 100644 index 00000000..030f19ba --- /dev/null +++ b/test/projectgraph/cases/javascript/vue-route-dynamic-import/project/package.json @@ -0,0 +1,5 @@ +{ + "name": "vue-route-dynamic-import", + "main": "src/main.js", + "dependencies": { "vue": "^3.4.0", "vue-router": "^4.3.0" } +} diff --git a/test/projectgraph/cases/javascript/vue-route-dynamic-import/project/src/main.js b/test/projectgraph/cases/javascript/vue-route-dynamic-import/project/src/main.js new file mode 100644 index 00000000..39085b95 --- /dev/null +++ b/test/projectgraph/cases/javascript/vue-route-dynamic-import/project/src/main.js @@ -0,0 +1,5 @@ +import { createApp, h } from 'vue'; +import { RouterView } from 'vue-router'; +import { router } from './router.js'; + +createApp({ render: () => h(RouterView) }).use(router).mount('#app'); diff --git a/test/projectgraph/cases/javascript/vue-route-dynamic-import/project/src/router.js b/test/projectgraph/cases/javascript/vue-route-dynamic-import/project/src/router.js new file mode 100644 index 00000000..e6268f17 --- /dev/null +++ b/test/projectgraph/cases/javascript/vue-route-dynamic-import/project/src/router.js @@ -0,0 +1,7 @@ +import { createRouter, createWebHistory } from 'vue-router'; + +const routes = [ + { path: '/', component: () => import('./views/Home.vue') }, +]; + +export const router = createRouter({ history: createWebHistory(), routes }); diff --git a/test/projectgraph/cases/javascript/vue-route-dynamic-import/project/src/views/Home.vue b/test/projectgraph/cases/javascript/vue-route-dynamic-import/project/src/views/Home.vue new file mode 100644 index 00000000..05dab581 --- /dev/null +++ b/test/projectgraph/cases/javascript/vue-route-dynamic-import/project/src/views/Home.vue @@ -0,0 +1,9 @@ + + + diff --git a/test/projectgraph/cases/javascript/vue-script-src/expect.yaml b/test/projectgraph/cases/javascript/vue-script-src/expect.yaml index 29f39ff6..ea07141b 100644 --- a/test/projectgraph/cases/javascript/vue-script-src/expect.yaml +++ b/test/projectgraph/cases/javascript/vue-script-src/expect.yaml @@ -1,6 +1,9 @@ source: safedep:hand description: The script element of Ext.vue loads logic.js by its src attribute. The element is an import of logic.js, so the search reaches edanger through it. roots: + - key: src/Ext.vue + kind: framework + rule: node.component - key: src/main.js kind: manifest rule: node.package-json @@ -34,11 +37,7 @@ results: - target: plug//edanger status: found path: - - key: src/main.js - key: src/Ext.vue - site: src/main.js:2 - kind: import - confidence: high - key: src/logic.js site: src/Ext.vue:2 kind: import diff --git a/test/projectgraph/cases/javascript/vue-setup-handler/expect.yaml b/test/projectgraph/cases/javascript/vue-setup-handler/expect.yaml index e0c011bc..f419a488 100644 --- a/test/projectgraph/cases/javascript/vue-setup-handler/expect.yaml +++ b/test/projectgraph/cases/javascript/vue-setup-handler/expect.yaml @@ -1,6 +1,9 @@ source: safedep:hand description: The template of App.vue names onClick as a click handler. No code of the script calls onClick, so only the markup record makes danger, which onClick calls, read uncertain and not not-found. roots: + - key: src/App.vue + kind: framework + rule: node.component - key: src/main.js kind: manifest rule: node.package-json diff --git a/test/projectgraph/cases/javascript/vue-template-markup/expect.yaml b/test/projectgraph/cases/javascript/vue-template-markup/expect.yaml index 41d80d3a..4363352f 100644 --- a/test/projectgraph/cases/javascript/vue-template-markup/expect.yaml +++ b/test/projectgraph/cases/javascript/vue-template-markup/expect.yaml @@ -1,6 +1,9 @@ source: safedep:hand description: The template of App.vue calls danger and render, which its script imports. The index does not parse the template, so the file has a markup record, and each target reads uncertain, not no-such-target. setup runs in the script and is found. roots: + - key: src/App.vue + kind: framework + rule: node.component - key: src/main.js kind: manifest rule: node.package-json @@ -29,11 +32,7 @@ results: - target: plug//setup status: found path: - - key: src/main.js - key: src/App.vue - site: src/main.js:2 - kind: import - confidence: high - key: plug//setup site: src/App.vue:8 kind: direct diff --git a/test/projectgraph/cases/javascript/vue-vite-fallback/expect.yaml b/test/projectgraph/cases/javascript/vue-vite-fallback/expect.yaml new file mode 100644 index 00000000..a7f79c79 --- /dev/null +++ b/test/projectgraph/cases/javascript/vue-vite-fallback/expect.yaml @@ -0,0 +1,81 @@ +source: safedep:hand +description: >- + Vite loads src/main.js from index.html, which no rule reads, and package.json names no entry. So the + roots fall back to the library surface. App.vue is a root of the rule node.component, and that rule + keeps the fallback on, so init, which only main.js calls, stays found. +roots: + - key: src/App.vue + kind: framework + rule: node.component + - key: src/App.vue + kind: library-surface + rule: library-surface + - key: src/main.js + kind: library-surface + rule: library-surface +exact_edges: true +edges: + - from: src/App.vue + to: plug//danger + kind: direct + confidence: high + site: src/App.vue:4 + - from: src/main.js + to: src/App.vue + kind: import + confidence: high + site: src/main.js:3 + - from: src/main.js + to: plug//init + kind: direct + confidence: high + site: src/main.js:5 + - from: src/main.js + to: vue//createApp + kind: direct + confidence: high + site: src/main.js:6 + - from: src/main.js + to: vue//createApp//mount + kind: direct + confidence: high + site: src/main.js:6 +unresolved: + - caller: src/App.vue + site: src/App.vue:1 + reason: markup + - caller: src/main.js + site: src/main.js:6 + reason: no-dependency-source + method: mount +results: + - target: plug//init + status: found + path: + - key: src/main.js + root: library-surface + - key: plug//init + site: src/main.js:5 + kind: direct + confidence: high + call_sites: + - caller: src/main.js + site: src/main.js:5 + reached: true + uncertainties: + - kind: root-fallback + - target: plug//danger + status: found + path: + - key: src/App.vue + root: framework + - key: plug//danger + site: src/App.vue:4 + kind: direct + confidence: high + call_sites: + - caller: src/App.vue + site: src/App.vue:4 + reached: true + uncertainties: + - kind: root-fallback diff --git a/test/projectgraph/cases/javascript/vue-vite-fallback/project/index.html b/test/projectgraph/cases/javascript/vue-vite-fallback/project/index.html new file mode 100644 index 00000000..74acba4f --- /dev/null +++ b/test/projectgraph/cases/javascript/vue-vite-fallback/project/index.html @@ -0,0 +1,2 @@ +
+ diff --git a/test/projectgraph/cases/javascript/vue-vite-fallback/project/package.json b/test/projectgraph/cases/javascript/vue-vite-fallback/project/package.json new file mode 100644 index 00000000..b5cd7dd7 --- /dev/null +++ b/test/projectgraph/cases/javascript/vue-vite-fallback/project/package.json @@ -0,0 +1,5 @@ +{ + "name": "vue-vite-fallback", + "private": true, + "dependencies": { "vue": "^3.4.0" } +} diff --git a/test/projectgraph/cases/javascript/vue-vite-fallback/project/src/App.vue b/test/projectgraph/cases/javascript/vue-vite-fallback/project/src/App.vue new file mode 100644 index 00000000..db48f660 --- /dev/null +++ b/test/projectgraph/cases/javascript/vue-vite-fallback/project/src/App.vue @@ -0,0 +1,9 @@ + + + diff --git a/test/projectgraph/cases/javascript/vue-vite-fallback/project/src/main.js b/test/projectgraph/cases/javascript/vue-vite-fallback/project/src/main.js new file mode 100644 index 00000000..58df0d7e --- /dev/null +++ b/test/projectgraph/cases/javascript/vue-vite-fallback/project/src/main.js @@ -0,0 +1,6 @@ +import { createApp } from 'vue'; +import { init } from 'plug'; +import App from './App.vue'; + +init(); +createApp(App).mount('#app'); diff --git a/test/projectgraph/cases/python/component-in-frontend/expect.yaml b/test/projectgraph/cases/python/component-in-frontend/expect.yaml new file mode 100644 index 00000000..0b02b9a0 --- /dev/null +++ b/test/projectgraph/cases/python/component-in-frontend/expect.yaml @@ -0,0 +1,71 @@ +source: safedep:hand +description: >- + A Python service ships a Vue frontend. App.vue is a root of the rule node.component, and its markup + record runs only JavaScript code. So the record concerns the targets that code of the JavaScript family + calls, and os.remove, which only dead Python code calls, stays not-found. plug.other has no node, so no + edge tells who calls it, and the record keeps it uncertain. Only dead Python code calls + jsonschema.validate, but App.vue imports validate from jsonschema and its template calls it, so the + record keeps jsonschema.validate uncertain. + The frontend has no entry of its own, as main of a package.json, so its files get the library-surface + roots, and each result carries the root-fallback uncertainty. +roots: + - key: frontend/src/App.vue + kind: framework + rule: node.component + - key: frontend/src/App.vue + kind: library-surface + rule: library-surface + - key: main.py + kind: manifest + rule: procfile +exact_edges: true +edges: + - from: frontend/src/App.vue + to: plug//render + kind: direct + confidence: high + site: frontend/src/App.vue:5 + - from: main.py + to: shutil//rmtree + kind: direct + confidence: high + site: main.py:12 + - from: main.py//unused + to: os//remove + kind: direct + confidence: high + site: main.py:8 + - from: main.py//unused + to: jsonschema//validate + kind: direct + confidence: high + site: main.py:9 +unresolved: + - caller: frontend/src/App.vue + site: frontend/src/App.vue:1 + reason: markup +results: + - target: os//remove + status: not-found + call_sites: + - caller: main.py//unused + site: main.py:8 + reached: false + uncertainties: + - kind: root-fallback + - target: plug//other + status: uncertain + uncertainties: + - kind: unresolved-call + site: frontend/src/App.vue:1 + - kind: root-fallback + - target: jsonschema//validate + status: uncertain + call_sites: + - caller: main.py//unused + site: main.py:9 + reached: false + uncertainties: + - kind: unresolved-call + site: frontend/src/App.vue:1 + - kind: root-fallback diff --git a/test/projectgraph/cases/python/component-in-frontend/project/Procfile b/test/projectgraph/cases/python/component-in-frontend/project/Procfile new file mode 100644 index 00000000..629b83ad --- /dev/null +++ b/test/projectgraph/cases/python/component-in-frontend/project/Procfile @@ -0,0 +1 @@ +web: python main.py diff --git a/test/projectgraph/cases/python/component-in-frontend/project/frontend/package.json b/test/projectgraph/cases/python/component-in-frontend/project/frontend/package.json new file mode 100644 index 00000000..be960f5a --- /dev/null +++ b/test/projectgraph/cases/python/component-in-frontend/project/frontend/package.json @@ -0,0 +1 @@ +{ "name": "frontend", "dependencies": { "vue": "^3.4.0" } } diff --git a/test/projectgraph/cases/python/component-in-frontend/project/frontend/src/App.vue b/test/projectgraph/cases/python/component-in-frontend/project/frontend/src/App.vue new file mode 100644 index 00000000..55a127b8 --- /dev/null +++ b/test/projectgraph/cases/python/component-in-frontend/project/frontend/src/App.vue @@ -0,0 +1,10 @@ + + + diff --git a/test/projectgraph/cases/python/component-in-frontend/project/main.py b/test/projectgraph/cases/python/component-in-frontend/project/main.py new file mode 100644 index 00000000..dba04da7 --- /dev/null +++ b/test/projectgraph/cases/python/component-in-frontend/project/main.py @@ -0,0 +1,12 @@ +import os +import shutil + +import jsonschema + + +def unused(): + os.remove("x") + jsonschema.validate(1, {}) + + +shutil.rmtree("y") diff --git a/test/projectgraph/cases/python/dependency-compiled-module/summaries/pypi_speedy_1.0.0.json b/test/projectgraph/cases/python/dependency-compiled-module/summaries/pypi_speedy_1.0.0.json index 0d53d13f..5f6cd86a 100644 --- a/test/projectgraph/cases/python/dependency-compiled-module/summaries/pypi_speedy_1.0.0.json +++ b/test/projectgraph/cases/python/dependency-compiled-module/summaries/pypi_speedy_1.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "pypi:speedy@1.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/python/dependency-dark-unit-record/summaries/pypi_PyYAML_6.0.1.json b/test/projectgraph/cases/python/dependency-dark-unit-record/summaries/pypi_PyYAML_6.0.1.json index 0a8677f0..5849dba5 100644 --- a/test/projectgraph/cases/python/dependency-dark-unit-record/summaries/pypi_PyYAML_6.0.1.json +++ b/test/projectgraph/cases/python/dependency-dark-unit-record/summaries/pypi_PyYAML_6.0.1.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "pypi:PyYAML@6.0.1", "symbols": [ { diff --git a/test/projectgraph/cases/python/dependency-dark-unit/summaries/pypi_PyYAML_6.0.1.json b/test/projectgraph/cases/python/dependency-dark-unit/summaries/pypi_PyYAML_6.0.1.json index 71bf9342..516122d0 100644 --- a/test/projectgraph/cases/python/dependency-dark-unit/summaries/pypi_PyYAML_6.0.1.json +++ b/test/projectgraph/cases/python/dependency-dark-unit/summaries/pypi_PyYAML_6.0.1.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "pypi:PyYAML@6.0.1", "symbols": [ { diff --git a/test/projectgraph/cases/python/dependency-failed-reached/summaries/pypi_badpkg_1.0.0.json b/test/projectgraph/cases/python/dependency-failed-reached/summaries/pypi_badpkg_1.0.0.json index 65724707..f8a53885 100644 --- a/test/projectgraph/cases/python/dependency-failed-reached/summaries/pypi_badpkg_1.0.0.json +++ b/test/projectgraph/cases/python/dependency-failed-reached/summaries/pypi_badpkg_1.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "pypi:badpkg@1.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/python/dependency-failed-reached/summaries/pypi_okpkg_1.0.0.json b/test/projectgraph/cases/python/dependency-failed-reached/summaries/pypi_okpkg_1.0.0.json index c6085da1..fe635f3d 100644 --- a/test/projectgraph/cases/python/dependency-failed-reached/summaries/pypi_okpkg_1.0.0.json +++ b/test/projectgraph/cases/python/dependency-failed-reached/summaries/pypi_okpkg_1.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "pypi:okpkg@1.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/python/dependency-failed-unreached/summaries/pypi_badpkg_1.0.0.json b/test/projectgraph/cases/python/dependency-failed-unreached/summaries/pypi_badpkg_1.0.0.json index 65724707..f8a53885 100644 --- a/test/projectgraph/cases/python/dependency-failed-unreached/summaries/pypi_badpkg_1.0.0.json +++ b/test/projectgraph/cases/python/dependency-failed-unreached/summaries/pypi_badpkg_1.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "pypi:badpkg@1.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/python/dependency-failed-unreached/summaries/pypi_okpkg_1.0.0.json b/test/projectgraph/cases/python/dependency-failed-unreached/summaries/pypi_okpkg_1.0.0.json index c6085da1..fe635f3d 100644 --- a/test/projectgraph/cases/python/dependency-failed-unreached/summaries/pypi_okpkg_1.0.0.json +++ b/test/projectgraph/cases/python/dependency-failed-unreached/summaries/pypi_okpkg_1.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "pypi:okpkg@1.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/python/dependency-namespace-two-dists/summaries/pypi_google-auth_2.0.0.json b/test/projectgraph/cases/python/dependency-namespace-two-dists/summaries/pypi_google-auth_2.0.0.json index 9a94e4f5..d43d7884 100644 --- a/test/projectgraph/cases/python/dependency-namespace-two-dists/summaries/pypi_google-auth_2.0.0.json +++ b/test/projectgraph/cases/python/dependency-namespace-two-dists/summaries/pypi_google-auth_2.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "pypi:google-auth@2.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/python/dependency-namespace-two-dists/summaries/pypi_google-cloud-storage_2.1.0.json b/test/projectgraph/cases/python/dependency-namespace-two-dists/summaries/pypi_google-cloud-storage_2.1.0.json index 312a4125..ec782241 100644 --- a/test/projectgraph/cases/python/dependency-namespace-two-dists/summaries/pypi_google-cloud-storage_2.1.0.json +++ b/test/projectgraph/cases/python/dependency-namespace-two-dists/summaries/pypi_google-cloud-storage_2.1.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "pypi:google-cloud-storage@2.1.0", "symbols": [ { diff --git a/test/projectgraph/cases/python/dependency-package-dir/summaries/pypi_outer_1.0.0.json b/test/projectgraph/cases/python/dependency-package-dir/summaries/pypi_outer_1.0.0.json index ec7f1191..4a512b50 100644 --- a/test/projectgraph/cases/python/dependency-package-dir/summaries/pypi_outer_1.0.0.json +++ b/test/projectgraph/cases/python/dependency-package-dir/summaries/pypi_outer_1.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "pypi:outer@1.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/python/dependency-record-import-name/summaries/pypi_PyYAML_6.0.1.json b/test/projectgraph/cases/python/dependency-record-import-name/summaries/pypi_PyYAML_6.0.1.json index 71bf9342..516122d0 100644 --- a/test/projectgraph/cases/python/dependency-record-import-name/summaries/pypi_PyYAML_6.0.1.json +++ b/test/projectgraph/cases/python/dependency-record-import-name/summaries/pypi_PyYAML_6.0.1.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "pypi:PyYAML@6.0.1", "symbols": [ { diff --git a/test/projectgraph/cases/python/dependency-site-packages/summaries/pypi_requests_2.31.0.json b/test/projectgraph/cases/python/dependency-site-packages/summaries/pypi_requests_2.31.0.json index 18461637..e01c72f9 100644 --- a/test/projectgraph/cases/python/dependency-site-packages/summaries/pypi_requests_2.31.0.json +++ b/test/projectgraph/cases/python/dependency-site-packages/summaries/pypi_requests_2.31.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "pypi:requests@2.31.0", "symbols": [ { diff --git a/test/projectgraph/cases/python/dependency-site-packages/summaries/pypi_urllib3_2.0.7.json b/test/projectgraph/cases/python/dependency-site-packages/summaries/pypi_urllib3_2.0.7.json index 22b9b6ff..b9b5e47f 100644 --- a/test/projectgraph/cases/python/dependency-site-packages/summaries/pypi_urllib3_2.0.7.json +++ b/test/projectgraph/cases/python/dependency-site-packages/summaries/pypi_urllib3_2.0.7.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "pypi:urllib3@2.0.7", "symbols": [ { diff --git a/test/projectgraph/cases/python/dependency-stdlib/summaries/python_std_3.12.3.json b/test/projectgraph/cases/python/dependency-stdlib/summaries/python_std_3.12.3.json index 720fcc94..717724a6 100644 --- a/test/projectgraph/cases/python/dependency-stdlib/summaries/python_std_3.12.3.json +++ b/test/projectgraph/cases/python/dependency-stdlib/summaries/python_std_3.12.3.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "python:std@3.12.3", "symbols": [ { diff --git a/test/projectgraph/cases/python/dependency-typed-return/summaries/pypi_dep_1.0.0.json b/test/projectgraph/cases/python/dependency-typed-return/summaries/pypi_dep_1.0.0.json index 4021d152..bf3c0a68 100644 --- a/test/projectgraph/cases/python/dependency-typed-return/summaries/pypi_dep_1.0.0.json +++ b/test/projectgraph/cases/python/dependency-typed-return/summaries/pypi_dep_1.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "pypi:dep@1.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/python/handler-beside-js-package/expect.yaml b/test/projectgraph/cases/python/handler-beside-js-package/expect.yaml new file mode 100644 index 00000000..6c5d2338 --- /dev/null +++ b/test/projectgraph/cases/python/handler-beside-js-package/expect.yaml @@ -0,0 +1,69 @@ +source: safedep:hand +description: >- + handlers/api.py holds a Lambda handler with no main guard, so no rule marks a root of Python. ui holds a + JavaScript package with a main. The fallback is decided per language family, so the Python file gets + the library-surface roots although JavaScript has an entry, and yaml.load is found. +roots: + - key: handlers/api.py + kind: library-surface + rule: library-surface + - key: handlers/api.py//handler + kind: library-surface + rule: library-surface + - key: ui/src/App.vue + kind: framework + rule: node.component + - key: ui/src/index.js + kind: manifest + rule: node.package-json +exact_edges: true +edges: + - from: handlers/api.py//handler + to: yaml//load + kind: direct + confidence: high + site: handlers/api.py:5 + - from: ui/src/App.vue + to: plug//render + kind: direct + confidence: high + site: ui/src/App.vue:4 + - from: ui/src/index.js + to: ui/src/App.vue + kind: import + confidence: high + site: ui/src/index.js:2 + - from: ui/src/index.js + to: vue//createApp + kind: direct + confidence: high + site: ui/src/index.js:4 + - from: ui/src/index.js + to: vue//createApp//mount + kind: direct + confidence: high + site: ui/src/index.js:4 +unresolved: + - caller: ui/src/App.vue + site: ui/src/App.vue:1 + reason: markup + - caller: ui/src/index.js + site: ui/src/index.js:4 + reason: no-dependency-source + method: mount +results: + - target: yaml//load + status: found + path: + - key: handlers/api.py//handler + root: library-surface + - key: yaml//load + site: handlers/api.py:5 + kind: direct + confidence: high + call_sites: + - caller: handlers/api.py//handler + site: handlers/api.py:5 + reached: true + uncertainties: + - kind: root-fallback diff --git a/test/projectgraph/cases/python/handler-beside-js-package/project/handlers/api.py b/test/projectgraph/cases/python/handler-beside-js-package/project/handlers/api.py new file mode 100644 index 00000000..7dd6bde3 --- /dev/null +++ b/test/projectgraph/cases/python/handler-beside-js-package/project/handlers/api.py @@ -0,0 +1,5 @@ +import yaml + + +def handler(event, context): + return yaml.load(event["body"]) diff --git a/test/projectgraph/cases/python/handler-beside-js-package/project/ui/package.json b/test/projectgraph/cases/python/handler-beside-js-package/project/ui/package.json new file mode 100644 index 00000000..20852d71 --- /dev/null +++ b/test/projectgraph/cases/python/handler-beside-js-package/project/ui/package.json @@ -0,0 +1 @@ +{ "name": "ui", "main": "src/index.js", "dependencies": { "vue": "^3.4.0" } } diff --git a/test/projectgraph/cases/python/handler-beside-js-package/project/ui/src/App.vue b/test/projectgraph/cases/python/handler-beside-js-package/project/ui/src/App.vue new file mode 100644 index 00000000..ebaae70d --- /dev/null +++ b/test/projectgraph/cases/python/handler-beside-js-package/project/ui/src/App.vue @@ -0,0 +1,9 @@ + + + diff --git a/test/projectgraph/cases/python/handler-beside-js-package/project/ui/src/index.js b/test/projectgraph/cases/python/handler-beside-js-package/project/ui/src/index.js new file mode 100644 index 00000000..684d0421 --- /dev/null +++ b/test/projectgraph/cases/python/handler-beside-js-package/project/ui/src/index.js @@ -0,0 +1,4 @@ +import { createApp } from 'vue'; +import App from './App.vue'; + +createApp(App).mount('#app'); diff --git a/test/projectgraph/cases/python/instance-made-by-reference/expect.yaml b/test/projectgraph/cases/python/instance-made-by-reference/expect.yaml new file mode 100644 index 00000000..f082c156 --- /dev/null +++ b/test/projectgraph/cases/python/instance-made-by-reference/expect.yaml @@ -0,0 +1,526 @@ +source: safedep:hand +description: >- + Each class makes an instance in a way other than a call of its name. cls() in the classmethod create + calls the class of the method. functools.partial and field(default_factory=...) get the class as a + value and call it. klass() in a function that the classmethod build defines calls its first parameter. + self.__class__() in clone and type(self)() in dup call the class of the instance, and copies calls + clone and dup on a parameter, and raise Raised makes an instance of + Raised. So each of these sites links the __call__ or __getattr__ of the class, and the os targets of + those classes are found. check names Meta only in isinstance, and check_more names Checked only in + typing.cast, hasattr and a conditional in isinstance, which make no instance. So tempfile.mkdtemp and + os.mkdir are not-found. Shadowed.build defines inner, + whose parameter klass hides the class, and local, which assigns klass. Neither call of klass makes a + Shadowed, so os.kill is not-found. + Both inherits the metaclass Base1 from First and the metaclass Derived, a subclass of Base1, from + Second. Python takes the most derived one, so Both() runs Derived.__call__, os.symlink is found and + os.lchown in Base1.__call__ is not-found. +roots: + - key: main.py + kind: main + rule: python.main-guard +exact_edges: true +edges: + - from: main.py + to: dataclasses//dataclass + kind: direct + confidence: high + site: main.py:30 + - from: main.py + to: dataclasses//field + kind: direct + confidence: high + site: main.py:31 + - from: main.py + to: main.py//ByDefault + kind: reference + confidence: low + site: main.py:31 + - from: main.py + to: main.py//ByDefault//__getattr__ + kind: reference + confidence: low + site: main.py:31 + - from: main.py + to: main.py//Base1 + kind: reference + confidence: low + site: main.py:61 + - from: main.py + to: main.py//Derived + kind: reference + confidence: low + site: main.py:65 + - from: main.py + to: main.py//run + kind: direct + confidence: high + site: main.py:139 + - from: main.py + to: main.py//ByClassmethod//create + kind: member + confidence: high + site: main.py:139 + - from: main.py + to: main.py//run + kind: direct + confidence: high + site: main.py:140 + - from: main.py + to: functools//partial + kind: direct + confidence: high + site: main.py:140 + - from: main.py + to: main.py//ByPartial + kind: reference + confidence: low + site: main.py:140 + - from: main.py + to: main.py//ByPartial//__call__ + kind: reference + confidence: low + site: main.py:140 + - from: main.py + to: print + kind: direct + confidence: high + site: main.py:141 + - from: main.py + to: main.py//Holder + kind: direct + confidence: high + site: main.py:141 + - from: main.py + to: main.py//check + kind: direct + confidence: high + site: main.py:142 + - from: main.py + to: main.py//run + kind: direct + confidence: high + site: main.py:143 + - from: main.py + to: main.py//ByKlass//build + kind: member + confidence: high + site: main.py:143 + - from: main.py + to: main.py//Shadowed//build + kind: member + confidence: high + site: main.py:144 + - from: main.py + to: main.py//Both + kind: direct + confidence: high + site: main.py:145 + - from: main.py + to: main.py//Derived//__call__ + kind: reference + confidence: low + site: main.py:145 + - from: main.py + to: main.py//copies + kind: direct + confidence: high + site: main.py:146 + - from: main.py + to: main.py//fail + kind: direct + confidence: high + site: main.py:147 + - from: main.py + to: main.py//check_more + kind: direct + confidence: high + site: main.py:148 + - from: main.py//Base1//__call__ + to: os//lchown + kind: direct + confidence: high + site: main.py:53 + - from: main.py//ByClassmethod//__call__ + to: os//remove + kind: direct + confidence: high + site: main.py:12 + - from: main.py//ByClassmethod//create + to: main.py//ByClassmethod//__call__ + kind: reference + confidence: low + site: main.py:16 + - from: main.py//ByDefault//__getattr__ + to: subprocess//run + kind: direct + confidence: high + site: main.py:26 + - from: main.py//ByInstanceClass//__getattr__ + to: os//rename + kind: direct + confidence: high + site: main.py:91 + - from: main.py//ByInstanceClass//clone + to: main.py//ByInstanceClass//__getattr__ + kind: reference + confidence: low + site: main.py:94 + - from: main.py//ByKlass//__call__ + to: os//chmod + kind: direct + confidence: high + site: main.py:41 + - from: main.py//ByKlass//build + to: main.py//ByKlass//build//inner + kind: direct + confidence: high + site: main.py:48 + - from: main.py//ByKlass//build//inner + to: main.py//ByKlass//__call__ + kind: reference + confidence: low + site: main.py:46 + - from: main.py//ByPartial//__call__ + to: shutil//rmtree + kind: direct + confidence: high + site: main.py:21 + - from: main.py//ByType//__call__ + to: os//rmdir + kind: direct + confidence: high + site: main.py:99 + - from: main.py//ByType//dup + to: type + kind: direct + confidence: high + site: main.py:102 + - from: main.py//ByType//dup + to: main.py//ByType + kind: reference + confidence: low + site: main.py:102 + - from: main.py//ByType//dup + to: main.py//ByType//__call__ + kind: reference + confidence: low + site: main.py:102 + - from: main.py//Checked//__call__ + to: os//mkdir + kind: direct + confidence: high + site: main.py:112 + - from: main.py//Derived//__call__ + to: os//symlink + kind: direct + confidence: high + site: main.py:58 + - from: main.py//Meta//__call__ + to: tempfile//mkdtemp + kind: direct + confidence: high + site: main.py:36 + - from: main.py//Raised//__getattr__ + to: os//unlink + kind: direct + confidence: high + site: main.py:107 + - from: main.py//Shadowed//__call__ + to: os//kill + kind: direct + confidence: high + site: main.py:75 + - from: main.py//Shadowed//build + to: main.py//Shadowed//build//inner + kind: direct + confidence: high + site: main.py:86 + - from: main.py//Shadowed//build + to: main.py//Shadowed//build//local + kind: direct + confidence: high + site: main.py:86 + - from: main.py//Shadowed//build//local + to: int + kind: assignment + confidence: high + site: main.py:84 + - from: main.py//check + to: isinstance + kind: direct + confidence: high + site: main.py:135 + - from: main.py//check + to: main.py//Meta + kind: reference + confidence: low + site: main.py:135 + - from: main.py//check_more + to: typing//cast + kind: direct + confidence: high + site: main.py:129 + - from: main.py//check_more + to: main.py//Checked + kind: reference + confidence: low + site: main.py:129 + - from: main.py//check_more + to: hasattr + kind: direct + confidence: high + site: main.py:130 + - from: main.py//check_more + to: main.py//Checked + kind: reference + confidence: low + site: main.py:130 + - from: main.py//check_more + to: isinstance + kind: direct + confidence: high + site: main.py:131 + - from: main.py//check_more + to: main.py//Checked + kind: reference + confidence: low + site: main.py:131 + - from: main.py//check_more + to: main.py//Meta + kind: reference + confidence: low + site: main.py:131 + - from: main.py//copies + to: main.py//ByInstanceClass//clone + kind: name + confidence: low + site: main.py:124 + - from: main.py//copies + to: main.py//ByType//dup + kind: name + confidence: low + site: main.py:125 + - from: main.py//fail + to: main.py//Raised + kind: reference + confidence: low + site: main.py:120 + - from: main.py//fail + to: main.py//Raised//__getattr__ + kind: reference + confidence: low + site: main.py:120 +unresolved: + - caller: main.py//ByClassmethod//create + site: main.py:16 + reason: unknown-receiver + method: cls + - caller: main.py//ByKlass//build//inner + site: main.py:46 + reason: unknown-receiver + method: klass + - caller: main.py//Shadowed//build//inner + site: main.py:80 + reason: unknown-receiver + method: klass + - caller: main.py//ByInstanceClass//clone + site: main.py:94 + reason: no-definition + method: __class__ + - caller: main.py//run + site: main.py:116 + reason: unknown-receiver + method: f + - caller: main.py//copies + site: main.py:124 + reason: unknown-receiver + method: clone + - caller: main.py//copies + site: main.py:125 + reason: unknown-receiver + method: dup +results: + - target: os//remove + status: found + path: + - key: main.py + - key: main.py//ByClassmethod//create + site: main.py:139 + kind: member + confidence: high + - key: main.py//ByClassmethod//__call__ + site: main.py:16 + kind: reference + confidence: low + - key: os//remove + site: main.py:12 + kind: direct + confidence: high + call_sites: + - caller: main.py//ByClassmethod//__call__ + site: main.py:12 + reached: true + - target: shutil//rmtree + status: found + path: + - key: main.py + - key: main.py//ByPartial//__call__ + site: main.py:140 + kind: reference + confidence: low + - key: shutil//rmtree + site: main.py:21 + kind: direct + confidence: high + call_sites: + - caller: main.py//ByPartial//__call__ + site: main.py:21 + reached: true + - target: subprocess//run + status: found + path: + - key: main.py + - key: main.py//ByDefault//__getattr__ + site: main.py:31 + kind: reference + confidence: low + - key: subprocess//run + site: main.py:26 + kind: direct + confidence: high + call_sites: + - caller: main.py//ByDefault//__getattr__ + site: main.py:26 + reached: true + - target: tempfile//mkdtemp + status: not-found + call_sites: + - caller: main.py//Meta//__call__ + site: main.py:36 + reached: false + - target: os//chmod + status: found + path: + - key: main.py + - key: main.py//ByKlass//build + site: main.py:143 + kind: member + confidence: high + - key: main.py//ByKlass//build//inner + site: main.py:48 + kind: direct + confidence: high + - key: main.py//ByKlass//__call__ + site: main.py:46 + kind: reference + confidence: low + - key: os//chmod + site: main.py:41 + kind: direct + confidence: high + call_sites: + - caller: main.py//ByKlass//__call__ + site: main.py:41 + reached: true + - target: os//rename + status: found + path: + - key: main.py + - key: main.py//copies + site: main.py:146 + kind: direct + confidence: high + - key: main.py//ByInstanceClass//clone + site: main.py:124 + kind: name + confidence: low + - key: main.py//ByInstanceClass//__getattr__ + site: main.py:94 + kind: reference + confidence: low + - key: os//rename + site: main.py:91 + kind: direct + confidence: high + call_sites: + - caller: main.py//ByInstanceClass//__getattr__ + site: main.py:91 + reached: true + - target: os//rmdir + status: found + path: + - key: main.py + - key: main.py//copies + site: main.py:146 + kind: direct + confidence: high + - key: main.py//ByType//dup + site: main.py:125 + kind: name + confidence: low + - key: main.py//ByType//__call__ + site: main.py:102 + kind: reference + confidence: low + - key: os//rmdir + site: main.py:99 + kind: direct + confidence: high + call_sites: + - caller: main.py//ByType//__call__ + site: main.py:99 + reached: true + - target: os//unlink + status: found + path: + - key: main.py + - key: main.py//fail + site: main.py:147 + kind: direct + confidence: high + - key: main.py//Raised//__getattr__ + site: main.py:120 + kind: reference + confidence: low + - key: os//unlink + site: main.py:107 + kind: direct + confidence: high + call_sites: + - caller: main.py//Raised//__getattr__ + site: main.py:107 + reached: true + - target: os//mkdir + status: not-found + call_sites: + - caller: main.py//Checked//__call__ + site: main.py:112 + reached: false + - target: os//kill + status: not-found + call_sites: + - caller: main.py//Shadowed//__call__ + site: main.py:75 + reached: false + - target: os//symlink + status: found + path: + - key: main.py + - key: main.py//Derived//__call__ + site: main.py:145 + kind: reference + confidence: low + - key: os//symlink + site: main.py:58 + kind: direct + confidence: high + call_sites: + - caller: main.py//Derived//__call__ + site: main.py:58 + reached: true + - target: os//lchown + status: not-found + call_sites: + - caller: main.py//Base1//__call__ + site: main.py:53 + reached: false diff --git a/test/projectgraph/cases/python/instance-made-by-reference/project/main.py b/test/projectgraph/cases/python/instance-made-by-reference/project/main.py new file mode 100644 index 00000000..ee68a4e9 --- /dev/null +++ b/test/projectgraph/cases/python/instance-made-by-reference/project/main.py @@ -0,0 +1,148 @@ +import functools +import os +import shutil +import subprocess +import tempfile +import typing +from dataclasses import dataclass, field + + +class ByClassmethod: + def __call__(self): + os.remove("a") + + @classmethod + def create(cls): + return cls() + + +class ByPartial: + def __call__(self): + shutil.rmtree("b") + + +class ByDefault: + def __getattr__(self, name): + subprocess.run("c") + + +@dataclass +class Holder: + d: ByDefault = field(default_factory=ByDefault) + + +class Meta(type): + def __call__(cls, *args): + tempfile.mkdtemp() + + +class ByKlass: + def __call__(self): + os.chmod("e", 0) + + @classmethod + def build(klass): + def inner(): + return klass() + + return inner() + + +class Base1(type): + def __call__(cls, *args): + os.lchown("k", 0, 0) + + +class Derived(Base1): + def __call__(cls, *args): + os.symlink("l", "m") + + +class First(metaclass=Base1): + pass + + +class Second(metaclass=Derived): + pass + + +class Both(First, Second): + pass + + +class Shadowed: + def __call__(self): + os.kill(0, 0) + + @classmethod + def build(klass): + def inner(klass): + return klass() + + def local(): + klass = int + return klass() + + return inner(lambda: 1), local() + + +class ByInstanceClass: + def __getattr__(self, name): + os.rename("f", "g") + + def clone(self): + return self.__class__() + + +class ByType: + def __call__(self): + os.rmdir("h") + + def dup(self): + return type(self)() + + +class Raised(Exception): + def __getattr__(self, name): + os.unlink("i") + + +class Checked: + def __call__(self): + os.mkdir("j") + + +def run(f): + f() + + +def fail(): + raise Raised + + +def copies(seed): + seed.clone() + seed.dup() + + +def check_more(x, c): + typing.cast(Checked, x) + hasattr(Checked, "x") + return isinstance(x, Checked if c else Meta) + + +def check(x): + return isinstance(x, Meta) + + +if __name__ == "__main__": + run(ByClassmethod.create()) + run(functools.partial(ByPartial)()) + print(Holder().d.anything) + check(1) + run(ByKlass.build()) + Shadowed.build() + Both() + copies(None) + fail() + check_more(1, True) diff --git a/test/projectgraph/cases/python/instance-methods-no-instance/expect.yaml b/test/projectgraph/cases/python/instance-methods-no-instance/expect.yaml new file mode 100644 index 00000000..f7346200 --- /dev/null +++ b/test/projectgraph/cases/python/instance-methods-no-instance/expect.yaml @@ -0,0 +1,128 @@ +source: safedep:hand +description: >- + Proxy defines __call__ and __getattr__, and Desc defines __get__. No code makes an instance of them: + check names them only in isinstance, and main calls a static method and reads a class attribute. So no + edge leads to these methods, and their targets are not-found. Made names the metaclass Meta, and main + calls Made, which runs Meta.__call__. So the call of Made leads to Meta.__call__, and tempfile.mkdtemp + is found. +roots: + - key: main.py + kind: main + rule: python.main-guard +exact_edges: true +edges: + - from: main.py + to: main.py//Meta + kind: reference + confidence: low + site: main.py:31 + - from: main.py + to: main.py//main + kind: direct + confidence: high + site: main.py:47 + - from: main.py//Desc//__get__ + to: subprocess//run + kind: direct + confidence: high + site: main.py:23 + - from: main.py//Meta//__call__ + to: tempfile//mkdtemp + kind: direct + confidence: high + site: main.py:28 + - from: main.py//Proxy//__call__ + to: os//remove + kind: direct + confidence: high + site: main.py:11 + - from: main.py//Proxy//__getattr__ + to: shutil//rmtree + kind: direct + confidence: high + site: main.py:14 + - from: main.py//check + to: isinstance + kind: direct + confidence: high + site: main.py:36 + - from: main.py//check + to: main.py//Proxy + kind: reference + confidence: low + site: main.py:36 + - from: main.py//check + to: isinstance + kind: direct + confidence: high + site: main.py:36 + - from: main.py//check + to: main.py//Desc + kind: reference + confidence: low + site: main.py:36 + - from: main.py//main + to: main.py//check + kind: direct + confidence: high + site: main.py:40 + - from: main.py//main + to: main.py//Proxy//helper + kind: member + confidence: high + site: main.py:41 + - from: main.py//main + to: print + kind: direct + confidence: high + site: main.py:42 + - from: main.py//main + to: main.py//Made + kind: direct + confidence: high + site: main.py:43 + - from: main.py//main + to: main.py//Meta//__call__ + kind: reference + confidence: low + site: main.py:43 +unresolved: [] +results: + - target: os//remove + status: not-found + call_sites: + - caller: main.py//Proxy//__call__ + site: main.py:11 + reached: false + - target: shutil//rmtree + status: not-found + call_sites: + - caller: main.py//Proxy//__getattr__ + site: main.py:14 + reached: false + - target: subprocess//run + status: not-found + call_sites: + - caller: main.py//Desc//__get__ + site: main.py:23 + reached: false + - target: tempfile//mkdtemp + status: found + path: + - key: main.py + - key: main.py//main + site: main.py:47 + kind: direct + confidence: high + - key: main.py//Meta//__call__ + site: main.py:43 + kind: reference + confidence: low + - key: tempfile//mkdtemp + site: main.py:28 + kind: direct + confidence: high + call_sites: + - caller: main.py//Meta//__call__ + site: main.py:28 + reached: true diff --git a/test/projectgraph/cases/python/instance-methods-no-instance/project/main.py b/test/projectgraph/cases/python/instance-methods-no-instance/project/main.py new file mode 100644 index 00000000..758e8d0c --- /dev/null +++ b/test/projectgraph/cases/python/instance-methods-no-instance/project/main.py @@ -0,0 +1,47 @@ +import os +import shutil +import subprocess +import tempfile + + +class Proxy: + LIMIT = 3 + + def __call__(self): + os.remove("x") + + def __getattr__(self, name): + shutil.rmtree("y") + + @staticmethod + def helper(): + return 1 + + +class Desc: + def __get__(self, obj, typ=None): + subprocess.run("z") + + +class Meta(type): + def __call__(cls, *a): + tempfile.mkdtemp() + + +class Made(metaclass=Meta): + pass + + +def check(x): + return isinstance(x, Proxy) or isinstance(x, Desc) + + +def main(): + check(1) + Proxy.helper() + print(Proxy.LIMIT) + Made() + + +if __name__ == "__main__": + main() diff --git a/test/projectgraph/cases/python/name-ambiguous-callable/expect.yaml b/test/projectgraph/cases/python/name-ambiguous-callable/expect.yaml index c3de824a..a13f5ee4 100644 --- a/test/projectgraph/cases/python/name-ambiguous-callable/expect.yaml +++ b/test/projectgraph/cases/python/name-ambiguous-callable/expect.yaml @@ -1,24 +1,45 @@ source: safedep:hand description: >- dispatch calls handle on the parameter handler. 24 classes define a method handle, so the site is over - the cap of 20 and is ambiguous. H0 holds an object of Cb in its class attribute handle. main passes an H0, so the call runs Cb.__call__, which calls os.remove. That code is no - definition of the name handle. So the site keeps no method name and concerns every target, and os.remove - is uncertain and not not-found. + the cap of 20 and is ambiguous. H0 holds an object of Cb in its class attribute handle. main passes an H0, so + the call runs Cb.__call__, which calls os.remove. That code is no definition of the name handle, so the site + keeps no method name and concerns every target. The class body of H0 makes the object, so a reference edge + joins that call to Cb.__call__ and os.remove is found. No code + calls shutil.rmtree, and the ambiguous site makes it uncertain and not not-found. roots: - key: main.py kind: manifest rule: procfile +no_edges: + - from: main.py//dispatch + to: handlers.py//Cb//__call__ unresolved: - caller: main.py//dispatch site: main.py:4 reason: ambiguous results: - target: os//remove - status: uncertain + status: found + path: + - key: main.py + - key: handlers.py + site: main.py:1 + kind: import + confidence: high + - key: handlers.py//Cb//__call__ + site: handlers.py:8 + kind: reference + confidence: low + - key: os//remove + site: handlers.py:5 + kind: direct + confidence: high call_sites: - caller: handlers.py//Cb//__call__ site: handlers.py:5 - reached: false + reached: true + - target: shutil//rmtree + status: uncertain uncertainties: - kind: unresolved-call site: main.py:4 diff --git a/test/projectgraph/cases/python/name-ambiguous-getattr/expect.yaml b/test/projectgraph/cases/python/name-ambiguous-getattr/expect.yaml index e5f43d55..c9a9ca8e 100644 --- a/test/projectgraph/cases/python/name-ambiguous-getattr/expect.yaml +++ b/test/projectgraph/cases/python/name-ambiguous-getattr/expect.yaml @@ -2,23 +2,44 @@ source: safedep:hand description: >- dispatch calls handle on the parameter handler. 24 classes define a method handle, so the site is over the cap of 20 and is ambiguous. main passes an H0, which defines no handle. Its __getattr__ gives cleanup, - which calls os.remove. That code is no definition of the name handle. So the site keeps no method name - and concerns every target, and os.remove is uncertain and not not-found. + which calls os.remove. That code is no definition of the name handle, so the site keeps no method name and + concerns every target. A read of an attribute of an H0 can run H0.__getattr__, so a reference edge joins the + call that makes the H0 to H0.__getattr__ and os.remove is found. No code calls shutil.rmtree, and the ambiguous site makes it + uncertain and not not-found. roots: - key: main.py kind: manifest rule: procfile +no_edges: + - from: main.py//dispatch + to: handlers.py//H0//__getattr__ unresolved: - caller: main.py//dispatch site: main.py:4 reason: ambiguous results: - target: os//remove - status: uncertain + status: found + path: + - key: main.py + - key: handlers.py//H0//__getattr__ + site: main.py:6 + kind: reference + confidence: low + - key: handlers.py//cleanup + site: handlers.py:8 + kind: reference + confidence: low + - key: os//remove + site: handlers.py:4 + kind: direct + confidence: high call_sites: - caller: handlers.py//cleanup site: handlers.py:4 - reached: false + reached: true + - target: shutil//rmtree + status: uncertain uncertainties: - kind: unresolved-call site: main.py:4 diff --git a/test/projectgraph/cases/python/typed-base-subclass/summaries/pypi_dep_1.0.0.json b/test/projectgraph/cases/python/typed-base-subclass/summaries/pypi_dep_1.0.0.json index 4021d152..bf3c0a68 100644 --- a/test/projectgraph/cases/python/typed-base-subclass/summaries/pypi_dep_1.0.0.json +++ b/test/projectgraph/cases/python/typed-base-subclass/summaries/pypi_dep_1.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "pypi:dep@1.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/python/unknown-receiver-callable/expect.yaml b/test/projectgraph/cases/python/unknown-receiver-callable/expect.yaml new file mode 100644 index 00000000..a0c1f6a2 --- /dev/null +++ b/test/projectgraph/cases/python/unknown-receiver-callable/expect.yaml @@ -0,0 +1,69 @@ +source: safedep:hand +description: >- + The class attribute handle of Handler holds an object of Cleaner, which inherits __call__ from Base. + dispatch calls handle on its parameter, so the receiver is unknown and the site is a record with the + method name handle. No definition of the name handle exists, and the call runs Base.__call__, which calls + os.remove. The class body of Handler makes the object, so a reference edge joins that call to the + __call__ of the MRO of Cleaner. +roots: + - key: main.py + kind: manifest + rule: procfile +exact_edges: true +edges: + - from: handlers.py + to: handlers.py//Base//__call__ + kind: reference + confidence: low + site: handlers.py:14 + - from: handlers.py + to: handlers.py//Cleaner + kind: direct + confidence: high + site: handlers.py:14 + - from: handlers.py//Base//__call__ + to: os//remove + kind: direct + confidence: high + site: handlers.py:6 + - from: main.py + to: handlers.py + kind: import + confidence: high + site: main.py:1 + - from: main.py + to: main.py//dispatch + kind: direct + confidence: high + site: main.py:8 + - from: main.py + to: handlers.py//Handler + kind: direct + confidence: high + site: main.py:8 +unresolved: + - caller: main.py//dispatch + site: main.py:5 + reason: unknown-receiver + method: handle +results: + - target: os//remove + status: found + path: + - key: main.py + - key: handlers.py + site: main.py:1 + kind: import + confidence: high + - key: handlers.py//Base//__call__ + site: handlers.py:14 + kind: reference + confidence: low + - key: os//remove + site: handlers.py:6 + kind: direct + confidence: high + call_sites: + - caller: handlers.py//Base//__call__ + site: handlers.py:6 + reached: true diff --git a/test/projectgraph/cases/python/unknown-receiver-callable/project/Procfile b/test/projectgraph/cases/python/unknown-receiver-callable/project/Procfile new file mode 100644 index 00000000..629b83ad --- /dev/null +++ b/test/projectgraph/cases/python/unknown-receiver-callable/project/Procfile @@ -0,0 +1 @@ +web: python main.py diff --git a/test/projectgraph/cases/python/unknown-receiver-callable/project/handlers.py b/test/projectgraph/cases/python/unknown-receiver-callable/project/handlers.py new file mode 100644 index 00000000..d0d61c45 --- /dev/null +++ b/test/projectgraph/cases/python/unknown-receiver-callable/project/handlers.py @@ -0,0 +1,14 @@ +import os + + +class Base: + def __call__(self, path): + os.remove(path) + + +class Cleaner(Base): + pass + + +class Handler: + handle = Cleaner() diff --git a/test/projectgraph/cases/python/unknown-receiver-callable/project/main.py b/test/projectgraph/cases/python/unknown-receiver-callable/project/main.py new file mode 100644 index 00000000..5c147caa --- /dev/null +++ b/test/projectgraph/cases/python/unknown-receiver-callable/project/main.py @@ -0,0 +1,8 @@ +from handlers import Handler + + +def dispatch(handler, path): + return handler.handle(path) + + +dispatch(Handler(), "a") diff --git a/test/projectgraph/cases/python/unknown-receiver-getattr/expect.yaml b/test/projectgraph/cases/python/unknown-receiver-getattr/expect.yaml new file mode 100644 index 00000000..aea0625b --- /dev/null +++ b/test/projectgraph/cases/python/unknown-receiver-getattr/expect.yaml @@ -0,0 +1,69 @@ +source: safedep:hand +description: >- + Handler defines no handle, and its __getattr__ gives cleanup for any name. dispatch calls handle on its + parameter, so the receiver is unknown and the site is a record with the method name handle. No definition + of the name handle exists, and the call runs cleanup, which calls os.remove. main makes a Handler, and a + read of an attribute of it can run Handler.__getattr__, so a reference edge joins the call that makes + the Handler to Handler.__getattr__. The function that __getattr__ returns is a reference of it. +roots: + - key: main.py + kind: manifest + rule: procfile +exact_edges: true +edges: + - from: handlers.py//Handler//__getattr__ + to: handlers.py//cleanup + kind: reference + confidence: low + site: handlers.py:10 + - from: handlers.py//cleanup + to: os//remove + kind: direct + confidence: high + site: handlers.py:5 + - from: main.py + to: handlers.py + kind: import + confidence: high + site: main.py:1 + - from: main.py + to: main.py//dispatch + kind: direct + confidence: high + site: main.py:8 + - from: main.py + to: handlers.py//Handler + kind: direct + confidence: high + site: main.py:8 + - from: main.py + to: handlers.py//Handler//__getattr__ + kind: reference + confidence: low + site: main.py:8 +unresolved: + - caller: main.py//dispatch + site: main.py:5 + reason: unknown-receiver + method: handle +results: + - target: os//remove + status: found + path: + - key: main.py + - key: handlers.py//Handler//__getattr__ + site: main.py:8 + kind: reference + confidence: low + - key: handlers.py//cleanup + site: handlers.py:10 + kind: reference + confidence: low + - key: os//remove + site: handlers.py:5 + kind: direct + confidence: high + call_sites: + - caller: handlers.py//cleanup + site: handlers.py:5 + reached: true diff --git a/test/projectgraph/cases/python/unknown-receiver-getattr/project/Procfile b/test/projectgraph/cases/python/unknown-receiver-getattr/project/Procfile new file mode 100644 index 00000000..629b83ad --- /dev/null +++ b/test/projectgraph/cases/python/unknown-receiver-getattr/project/Procfile @@ -0,0 +1 @@ +web: python main.py diff --git a/test/projectgraph/cases/python/unknown-receiver-getattr/project/handlers.py b/test/projectgraph/cases/python/unknown-receiver-getattr/project/handlers.py new file mode 100644 index 00000000..d0c30a13 --- /dev/null +++ b/test/projectgraph/cases/python/unknown-receiver-getattr/project/handlers.py @@ -0,0 +1,10 @@ +import os + + +def cleanup(path): + os.remove(path) + + +class Handler: + def __getattr__(self, name): + return cleanup diff --git a/test/projectgraph/cases/python/unknown-receiver-getattr/project/main.py b/test/projectgraph/cases/python/unknown-receiver-getattr/project/main.py new file mode 100644 index 00000000..5c147caa --- /dev/null +++ b/test/projectgraph/cases/python/unknown-receiver-getattr/project/main.py @@ -0,0 +1,8 @@ +from handlers import Handler + + +def dispatch(handler, path): + return handler.handle(path) + + +dispatch(Handler(), "a") diff --git a/test/projectgraph/cases/rust/crate-bindings/summaries/cargo_kit_1.0.0.json b/test/projectgraph/cases/rust/crate-bindings/summaries/cargo_kit_1.0.0.json index 3e168d70..909d8788 100644 --- a/test/projectgraph/cases/rust/crate-bindings/summaries/cargo_kit_1.0.0.json +++ b/test/projectgraph/cases/rust/crate-bindings/summaries/cargo_kit_1.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "cargo:kit@1.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/rust/dependency-crate/summaries/cargo_kit_1.0.0.json b/test/projectgraph/cases/rust/dependency-crate/summaries/cargo_kit_1.0.0.json index 1ef40a7f..577a7214 100644 --- a/test/projectgraph/cases/rust/dependency-crate/summaries/cargo_kit_1.0.0.json +++ b/test/projectgraph/cases/rust/dependency-crate/summaries/cargo_kit_1.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "cargo:kit@1.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/rust/dependency-internal-call/summaries/cargo_kit_1.0.0.json b/test/projectgraph/cases/rust/dependency-internal-call/summaries/cargo_kit_1.0.0.json index d5029bbf..50b47245 100644 --- a/test/projectgraph/cases/rust/dependency-internal-call/summaries/cargo_kit_1.0.0.json +++ b/test/projectgraph/cases/rust/dependency-internal-call/summaries/cargo_kit_1.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "cargo:kit@1.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/rust/dependency-renamed/summaries/cargo_kit_1.0.0.json b/test/projectgraph/cases/rust/dependency-renamed/summaries/cargo_kit_1.0.0.json index d5029bbf..50b47245 100644 --- a/test/projectgraph/cases/rust/dependency-renamed/summaries/cargo_kit_1.0.0.json +++ b/test/projectgraph/cases/rust/dependency-renamed/summaries/cargo_kit_1.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "cargo:kit@1.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/rust/generic-field-type/expect.yaml b/test/projectgraph/cases/rust/generic-field-type/expect.yaml new file mode 100644 index 00000000..dc02bf2a --- /dev/null +++ b/test/projectgraph/cases/rust/generic-field-type/expect.yaml @@ -0,0 +1,79 @@ +source: safedep:hand +description: >- + The file declares the struct T, and the type parameter T of Holder and of impl Wrap shadows + it. So the field item: T of Holder and the result &T of Wrap::get hold the type that the caller gives: Disk + in by_field and Cloud in by_result. Disk::save calls std::fs::remove_file and Cloud::save calls + std::fs::create_dir. An index that keeps T as the type of the field and of the result makes the link step + read the struct T, so both calls go to T::save with no record, and both targets read not-found. The index + keeps no such type, so each call is a record. The record of h.item.save() gets the low name edges of save. +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/main.rs//by_field + to: src/main.rs//Disk//save + kind: name + confidence: low + site: src/main.rs:41 + - from: src/main.rs//by_result + to: src/main.rs//Wrap//get + kind: member + confidence: high + site: src/main.rs:45 +no_edges: + - from: src/main.rs//by_result + to: src/main.rs//T//save +unresolved: + - caller: src/main.rs//by_field + site: src/main.rs:41 + reason: no-definition + method: save + - caller: src/main.rs//by_result + site: src/main.rs:45 + reason: unknown-receiver + method: save +results: + - target: std//fs//remove_file + status: found + path: + - key: src/main.rs//main + - key: src/main.rs//by_field + site: src/main.rs:49 + kind: direct + confidence: high + - key: src/main.rs//Disk//save + site: src/main.rs:41 + kind: name + confidence: low + - key: std//fs//remove_file + site: src/main.rs:18 + kind: direct + confidence: high + call_sites: + - caller: src/main.rs//Disk//save + site: src/main.rs:18 + reached: true + - target: std//fs//create_dir + status: found + path: + - key: src/main.rs//main + - key: src/main.rs//by_field + site: src/main.rs:49 + kind: direct + confidence: high + - key: src/main.rs//Cloud//save + site: src/main.rs:41 + kind: name + confidence: low + - key: std//fs//create_dir + site: src/main.rs:24 + kind: direct + confidence: high + call_sites: + - caller: src/main.rs//Cloud//save + site: src/main.rs:24 + reached: true diff --git a/test/projectgraph/cases/rust/generic-field-type/project/Cargo.toml b/test/projectgraph/cases/rust/generic-field-type/project/Cargo.toml new file mode 100644 index 00000000..0d44349a --- /dev/null +++ b/test/projectgraph/cases/rust/generic-field-type/project/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/generic-field-type/project/src/main.rs b/test/projectgraph/cases/rust/generic-field-type/project/src/main.rs new file mode 100644 index 00000000..78573bc1 --- /dev/null +++ b/test/projectgraph/cases/rust/generic-field-type/project/src/main.rs @@ -0,0 +1,51 @@ +pub struct T; + +impl T { + pub fn save(&self) { + let _ = std::fs::write("t", "x"); + } +} + +pub trait Save { + fn save(&self); +} + +pub struct Disk; +pub struct Cloud; + +impl Save for Disk { + fn save(&self) { + let _ = std::fs::remove_file("disk"); + } +} + +impl Save for Cloud { + fn save(&self) { + let _ = std::fs::create_dir("cloud"); + } +} + +pub struct Holder { + pub item: T, +} + +pub struct Wrap(T); + +impl Wrap { + pub fn get(&self) -> &T { + &self.0 + } +} + +fn by_field(h: Holder) { + h.item.save(); +} + +fn by_result(w: Wrap) { + w.get().save(); +} + +fn main() { + by_field(Holder { item: Disk }); + by_result(Wrap(Cloud)); +} diff --git a/test/projectgraph/cases/rust/generic-shadows-type/expect.yaml b/test/projectgraph/cases/rust/generic-shadows-type/expect.yaml new file mode 100644 index 00000000..bfdcfcc4 --- /dev/null +++ b/test/projectgraph/cases/rust/generic-shadows-type/expect.yaml @@ -0,0 +1,32 @@ +source: safedep:hand +description: >- + build has the type parameter Local with the bound Maker, which shadows the struct Local of the file. So + Local::make() in build runs make of the type that the caller gives, Real here, whose make calls + std::fs::create_dir. The make of the struct Local calls std::fs::remove_file and nothing calls it. The call + graph reads no type parameter, so it sends the call to Local::make of the struct. Without the rule, + std::fs::create_dir reads not-found. The index makes the call a record with the reason unknown-receiver. +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +no_edges: + - from: src/main.rs//build + to: src/main.rs//Local//make +edges: [] +unresolved: + - caller: src/main.rs//build + site: src/main.rs:24 + reason: unknown-receiver +results: + - target: std//fs//create_dir + status: uncertain + call_sites: + - caller: src/main.rs//Real//make + site: src/main.rs:17 + reached: false + uncertainties: + - kind: unresolved-call + site: src/main.rs:24 diff --git a/test/projectgraph/cases/rust/generic-shadows-type/project/Cargo.toml b/test/projectgraph/cases/rust/generic-shadows-type/project/Cargo.toml new file mode 100644 index 00000000..0d44349a --- /dev/null +++ b/test/projectgraph/cases/rust/generic-shadows-type/project/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/generic-shadows-type/project/src/main.rs b/test/projectgraph/cases/rust/generic-shadows-type/project/src/main.rs new file mode 100644 index 00000000..07177f3f --- /dev/null +++ b/test/projectgraph/cases/rust/generic-shadows-type/project/src/main.rs @@ -0,0 +1,29 @@ +pub struct Local; +pub struct Real; + +pub trait Maker { + fn make() -> Self; +} + +impl Local { + pub fn make() -> Local { + let _ = std::fs::remove_file("local"); + Local + } +} + +impl Maker for Real { + fn make() -> Real { + let _ = std::fs::create_dir("real"); + Real + } +} + +#[allow(non_camel_case_types)] +fn build() -> Local { + Local::make() +} + +fn main() { + let _ = build::(); +} diff --git a/test/projectgraph/cases/rust/glob-shadows-outer-type/expect.yaml b/test/projectgraph/cases/rust/glob-shadows-outer-type/expect.yaml new file mode 100644 index 00000000..47dc95ac --- /dev/null +++ b/test/projectgraph/cases/rust/glob-shadows-outer-type/expect.yaml @@ -0,0 +1,49 @@ +source: safedep:hand +description: >- + The inline module m declares a struct A, and its inline module n has use crate::other::*. n sees no item of m + with no use, so A in f names the A of src/other.rs, whose run calls std::fs::remove_file. The call graph + reads no use and finds the A of m, whose run calls std::fs::remove_dir. Without the rule, a call of A::new() + and of run in f goes to m::A with no record, and std::fs::remove_file reads not-found. The index makes each + such call a record, so the target reads found through the low name edges of run. +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/main.rs//m//n//f + to: src/other.rs//A//run + kind: name + confidence: low + site: src/main.rs:21 +unresolved: + - caller: src/main.rs//m//n//f + site: src/main.rs:20 + reason: unknown-receiver + - caller: src/main.rs//m//n//f + site: src/main.rs:21 + reason: unknown-receiver + method: run +results: + - target: std//fs//remove_file + status: found + path: + - key: src/main.rs//main + - key: src/main.rs//m//n//f + site: src/main.rs:27 + kind: direct + confidence: high + - key: src/other.rs//A//run + site: src/main.rs:21 + kind: name + confidence: low + - key: std//fs//remove_file + site: src/other.rs:9 + kind: direct + confidence: high + call_sites: + - caller: src/other.rs//A//run + site: src/other.rs:9 + reached: true diff --git a/test/projectgraph/cases/rust/glob-shadows-outer-type/project/Cargo.toml b/test/projectgraph/cases/rust/glob-shadows-outer-type/project/Cargo.toml new file mode 100644 index 00000000..0d44349a --- /dev/null +++ b/test/projectgraph/cases/rust/glob-shadows-outer-type/project/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/glob-shadows-outer-type/project/src/main.rs b/test/projectgraph/cases/rust/glob-shadows-outer-type/project/src/main.rs new file mode 100644 index 00000000..e28b4226 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-shadows-outer-type/project/src/main.rs @@ -0,0 +1,28 @@ +mod other; + +mod m { + pub struct A; + + impl A { + pub fn new() -> A { + A + } + + pub fn run(&self) { + let _ = std::fs::remove_dir("a"); + } + } + + pub mod n { + use crate::other::*; + + pub fn f() { + let a = A::new(); + a.run(); + } + } +} + +fn main() { + m::n::f(); +} diff --git a/test/projectgraph/cases/rust/glob-shadows-outer-type/project/src/other.rs b/test/projectgraph/cases/rust/glob-shadows-outer-type/project/src/other.rs new file mode 100644 index 00000000..f20cbee7 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-shadows-outer-type/project/src/other.rs @@ -0,0 +1,11 @@ +pub struct A; + +impl A { + pub fn new() -> A { + A + } + + pub fn run(&self) { + let _ = std::fs::remove_file("a"); + } +} diff --git a/test/projectgraph/cases/rust/glob-use-binding/expect.yaml b/test/projectgraph/cases/rust/glob-use-binding/expect.yaml new file mode 100644 index 00000000..27720faa --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-binding/expect.yaml @@ -0,0 +1,53 @@ +source: safedep:hand +description: >- + src/jobs/mod.rs has use crate::store::disk, so disk names the module src/store/disk.rs in the module jobs. + src/jobs/worker.rs has use super::*, which brings each name of jobs into worker, the binding disk too. So + disk::wipe in go calls the function wipe of src/store/disk.rs, which calls std::fs::remove_dir_all. No module + disk is a child of worker or of the root. A link step that stops the glob path on the module that a use + binds gives the call the key disk//wipe with no record, and std::fs::remove_dir_all reads not-found. +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +exact_edges: true +edges: + - from: src/main.rs//main + to: src/jobs/worker.rs//go + kind: direct + confidence: high + site: src/main.rs:5 + - from: src/jobs/worker.rs//go + to: src/store/disk.rs//wipe + kind: direct + confidence: high + site: src/jobs/worker.rs:4 + - from: src/store/disk.rs//wipe + to: std//fs//remove_dir_all + kind: direct + confidence: high + site: src/store/disk.rs:2 +unresolved: [] +results: + - target: std//fs//remove_dir_all + status: found + path: + - key: src/main.rs//main + - key: src/jobs/worker.rs//go + site: src/main.rs:5 + kind: direct + confidence: high + - key: src/store/disk.rs//wipe + site: src/jobs/worker.rs:4 + kind: direct + confidence: high + - key: std//fs//remove_dir_all + site: src/store/disk.rs:2 + kind: direct + confidence: high + call_sites: + - caller: src/store/disk.rs//wipe + site: src/store/disk.rs:2 + reached: true diff --git a/test/projectgraph/cases/rust/glob-use-binding/project/Cargo.toml b/test/projectgraph/cases/rust/glob-use-binding/project/Cargo.toml new file mode 100644 index 00000000..0d44349a --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-binding/project/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/glob-use-binding/project/src/jobs/mod.rs b/test/projectgraph/cases/rust/glob-use-binding/project/src/jobs/mod.rs new file mode 100644 index 00000000..34096fe2 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-binding/project/src/jobs/mod.rs @@ -0,0 +1,3 @@ +use crate::store::disk; + +pub mod worker; diff --git a/test/projectgraph/cases/rust/glob-use-binding/project/src/jobs/worker.rs b/test/projectgraph/cases/rust/glob-use-binding/project/src/jobs/worker.rs new file mode 100644 index 00000000..7699dc39 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-binding/project/src/jobs/worker.rs @@ -0,0 +1,5 @@ +use super::*; + +pub fn go() { + disk::wipe("x"); +} diff --git a/test/projectgraph/cases/rust/glob-use-binding/project/src/main.rs b/test/projectgraph/cases/rust/glob-use-binding/project/src/main.rs new file mode 100644 index 00000000..f42066e6 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-binding/project/src/main.rs @@ -0,0 +1,6 @@ +mod jobs; +mod store; + +fn main() { + jobs::worker::go(); +} diff --git a/test/projectgraph/cases/rust/glob-use-binding/project/src/store/disk.rs b/test/projectgraph/cases/rust/glob-use-binding/project/src/store/disk.rs new file mode 100644 index 00000000..c1f927fd --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-binding/project/src/store/disk.rs @@ -0,0 +1,3 @@ +pub fn wipe(p: &str) { + let _ = std::fs::remove_dir_all(p); +} diff --git a/test/projectgraph/cases/rust/glob-use-binding/project/src/store/mod.rs b/test/projectgraph/cases/rust/glob-use-binding/project/src/store/mod.rs new file mode 100644 index 00000000..088789b7 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-binding/project/src/store/mod.rs @@ -0,0 +1 @@ +pub mod disk; diff --git a/test/projectgraph/cases/rust/glob-use-crate-cycle/expect.yaml b/test/projectgraph/cases/rust/glob-use-crate-cycle/expect.yaml new file mode 100644 index 00000000..57aec1e4 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-cycle/expect.yaml @@ -0,0 +1,49 @@ +source: safedep:hand +description: >- + src/a.rs has use dep_b::* and src/b.rs has use dep_a::*, and both call n::f. dep_b has pub use dep_a::* and then + pub use dep_c::*, dep_a has pub use dep_b::*, and n is a module of dep_c. Cargo rejects such a cycle of crates, + but the read of a glob use must still end and give each path its answer. The read of n for src/a.rs asks dep_a, + which asks dep_b again, and the cycle guard cuts that inner read. A memo that keeps the answer of the cut read + for dep_a gives src/b.rs no module n, so its call reads n as a crate, and dep_c//n//f reads not-found from it. +units: + vendor/dep_a: cargo:dep_a@1.0.0 + vendor/dep_b: cargo:dep_b@1.0.0 + vendor/dep_c: cargo:dep_c@1.0.0 +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/a.rs//go + to: dep_b//n//f + kind: direct + confidence: high + site: src/a.rs:4 + - from: src/b.rs//go + to: dep_a//n//f + kind: direct + confidence: high + site: src/b.rs:4 +unresolved: [] +results: + - target: dep_c//n//f + status: found + sources: [src/b.rs//go] + sources_only: true + path: + - key: src/b.rs//go + - key: dep_a//n//f + site: src/b.rs:4 + kind: direct + confidence: high + - key: dep_b//n//f + site: cargo:dep_a@1.0.0 + kind: package + confidence: high + - key: dep_c//n//f + site: cargo:dep_b@1.0.0 + kind: package + confidence: high diff --git a/test/projectgraph/cases/rust/glob-use-crate-cycle/project/Cargo.toml b/test/projectgraph/cases/rust/glob-use-crate-cycle/project/Cargo.toml new file mode 100644 index 00000000..bf121dd4 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-cycle/project/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" + +[dependencies] +dep_a = "1.0.0" +dep_b = "1.0.0" diff --git a/test/projectgraph/cases/rust/glob-use-crate-cycle/project/src/a.rs b/test/projectgraph/cases/rust/glob-use-crate-cycle/project/src/a.rs new file mode 100644 index 00000000..ae913539 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-cycle/project/src/a.rs @@ -0,0 +1,5 @@ +use dep_b::*; + +pub fn go() { + n::f(); +} diff --git a/test/projectgraph/cases/rust/glob-use-crate-cycle/project/src/b.rs b/test/projectgraph/cases/rust/glob-use-crate-cycle/project/src/b.rs new file mode 100644 index 00000000..d0d2e32b --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-cycle/project/src/b.rs @@ -0,0 +1,5 @@ +use dep_a::*; + +pub fn go() { + n::f(); +} diff --git a/test/projectgraph/cases/rust/glob-use-crate-cycle/project/src/main.rs b/test/projectgraph/cases/rust/glob-use-crate-cycle/project/src/main.rs new file mode 100644 index 00000000..efffd961 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-cycle/project/src/main.rs @@ -0,0 +1,7 @@ +mod a; +mod b; + +fn main() { + a::go(); + b::go(); +} diff --git a/test/projectgraph/cases/rust/glob-use-crate-cycle/project/vendor/dep_a/Cargo.toml b/test/projectgraph/cases/rust/glob-use-crate-cycle/project/vendor/dep_a/Cargo.toml new file mode 100644 index 00000000..2316a378 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-cycle/project/vendor/dep_a/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "dep_a" +version = "1.0.0" +edition = "2021" + +[dependencies] +dep_b = "1.0.0" diff --git a/test/projectgraph/cases/rust/glob-use-crate-cycle/project/vendor/dep_a/src/lib.rs b/test/projectgraph/cases/rust/glob-use-crate-cycle/project/vendor/dep_a/src/lib.rs new file mode 100644 index 00000000..ae4fd6ef --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-cycle/project/vendor/dep_a/src/lib.rs @@ -0,0 +1,3 @@ +pub use dep_b::*; + +pub fn a() {} diff --git a/test/projectgraph/cases/rust/glob-use-crate-cycle/project/vendor/dep_b/Cargo.toml b/test/projectgraph/cases/rust/glob-use-crate-cycle/project/vendor/dep_b/Cargo.toml new file mode 100644 index 00000000..3ada9cc0 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-cycle/project/vendor/dep_b/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "dep_b" +version = "1.0.0" +edition = "2021" + +[dependencies] +dep_a = "1.0.0" +dep_c = "1.0.0" diff --git a/test/projectgraph/cases/rust/glob-use-crate-cycle/project/vendor/dep_b/src/lib.rs b/test/projectgraph/cases/rust/glob-use-crate-cycle/project/vendor/dep_b/src/lib.rs new file mode 100644 index 00000000..611ff513 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-cycle/project/vendor/dep_b/src/lib.rs @@ -0,0 +1,4 @@ +pub use dep_a::*; +pub use dep_c::*; + +pub fn b() {} diff --git a/test/projectgraph/cases/rust/glob-use-crate-cycle/project/vendor/dep_c/Cargo.toml b/test/projectgraph/cases/rust/glob-use-crate-cycle/project/vendor/dep_c/Cargo.toml new file mode 100644 index 00000000..70c42fb8 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-cycle/project/vendor/dep_c/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "dep_c" +version = "1.0.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/glob-use-crate-cycle/project/vendor/dep_c/src/lib.rs b/test/projectgraph/cases/rust/glob-use-crate-cycle/project/vendor/dep_c/src/lib.rs new file mode 100644 index 00000000..698957ad --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-cycle/project/vendor/dep_c/src/lib.rs @@ -0,0 +1 @@ +pub mod n; diff --git a/test/projectgraph/cases/rust/glob-use-crate-cycle/project/vendor/dep_c/src/n.rs b/test/projectgraph/cases/rust/glob-use-crate-cycle/project/vendor/dep_c/src/n.rs new file mode 100644 index 00000000..cdc6c27d --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-cycle/project/vendor/dep_c/src/n.rs @@ -0,0 +1 @@ +pub fn f() {} diff --git a/test/projectgraph/cases/rust/glob-use-crate-cycle/summaries/cargo_dep_a_1.0.0.json b/test/projectgraph/cases/rust/glob-use-crate-cycle/summaries/cargo_dep_a_1.0.0.json new file mode 100644 index 00000000..7fcb9e7f --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-cycle/summaries/cargo_dep_a_1.0.0.json @@ -0,0 +1,16 @@ +{ + "version": "3", + "index_version": "17", + "link_version": "20", + "unit": "cargo:dep_a@1.0.0", + "symbols": [ + { + "key": "dep_a//a", + "definitions": [ + "cargo:dep_a@1.0.0//src/lib.rs//a" + ], + "reaches": [] + } + ], + "targets": [] +} diff --git a/test/projectgraph/cases/rust/glob-use-crate-cycle/summaries/cargo_dep_b_1.0.0.json b/test/projectgraph/cases/rust/glob-use-crate-cycle/summaries/cargo_dep_b_1.0.0.json new file mode 100644 index 00000000..b20e638c --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-cycle/summaries/cargo_dep_b_1.0.0.json @@ -0,0 +1,16 @@ +{ + "version": "3", + "index_version": "17", + "link_version": "20", + "unit": "cargo:dep_b@1.0.0", + "symbols": [ + { + "key": "dep_b//b", + "definitions": [ + "cargo:dep_b@1.0.0//src/lib.rs//b" + ], + "reaches": [] + } + ], + "targets": [] +} diff --git a/test/projectgraph/cases/rust/glob-use-crate-cycle/summaries/cargo_dep_c_1.0.0.json b/test/projectgraph/cases/rust/glob-use-crate-cycle/summaries/cargo_dep_c_1.0.0.json new file mode 100644 index 00000000..b3fa4f57 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-cycle/summaries/cargo_dep_c_1.0.0.json @@ -0,0 +1,16 @@ +{ + "version": "3", + "index_version": "17", + "link_version": "20", + "unit": "cargo:dep_c@1.0.0", + "symbols": [ + { + "key": "dep_c//n//f", + "definitions": [ + "cargo:dep_c@1.0.0//src/n.rs//f" + ], + "reaches": [] + } + ], + "targets": [] +} diff --git a/test/projectgraph/cases/rust/glob-use-crate-visibility/expect.yaml b/test/projectgraph/cases/rust/glob-use-crate-visibility/expect.yaml new file mode 100644 index 00000000..cfee0d4f --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-visibility/expect.yaml @@ -0,0 +1,74 @@ +source: safedep:hand +description: >- + main.rs has use dep::html::* and use other::*, and calls render(), save() and load(). In dep::html, render is + pub(crate), save comes from a private use and load from a pub(crate) use, so another crate sees none of them, + and the glob use of dep::html brings none. other gives the pub functions render, save and load, so each call + runs code of other. A link step that takes pub(crate) for pub, or a use for a pub use, gives the calls the edges + to dep, and the code of dep reads found. Each call keeps its record of the single name, so the code of dep + reads uncertain. +units: + vendor/dep: cargo:dep@1.0.0 + vendor/other: cargo:other@1.0.0 +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/main.rs//main + to: other//render + kind: direct + confidence: high + site: src/main.rs:5 + - from: src/main.rs//main + to: other//save + kind: direct + confidence: high + site: src/main.rs:6 + - from: src/main.rs//main + to: other//load + kind: direct + confidence: high + site: src/main.rs:7 +no_edges: + - from: src/main.rs//main + to: dep//html//render + - from: src/main.rs//main + to: dep//html//save + - from: src/main.rs//main + to: dep//html//load +unresolved: + - caller: src/main.rs//main + site: src/main.rs:5 + reason: unknown-receiver + method: render + - caller: src/main.rs//main + site: src/main.rs:6 + reason: unknown-receiver + method: save + - caller: src/main.rs//main + site: src/main.rs:7 + reason: unknown-receiver + method: load +results: + - target: std//fs//remove_dir + status: uncertain + call_sites: + - caller: cargo:dep@1.0.0//src/html.rs//render + site: cargo:dep@1.0.0//src/html.rs:5 + reached: false + - caller: cargo:dep@1.0.0//src/inner.rs//save + site: cargo:dep@1.0.0//src/inner.rs:2 + reached: false + - caller: cargo:dep@1.0.0//src/inner.rs//load + site: cargo:dep@1.0.0//src/inner.rs:6 + reached: false + uncertainties: + - kind: unresolved-call + site: src/main.rs:5 + - kind: unresolved-call + site: src/main.rs:6 + - kind: unresolved-call + site: src/main.rs:7 diff --git a/test/projectgraph/cases/rust/glob-use-crate-visibility/project/Cargo.toml b/test/projectgraph/cases/rust/glob-use-crate-visibility/project/Cargo.toml new file mode 100644 index 00000000..9fdab07a --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-visibility/project/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" + +[dependencies] +dep = "1.0.0" +other = "1.0.0" diff --git a/test/projectgraph/cases/rust/glob-use-crate-visibility/project/src/main.rs b/test/projectgraph/cases/rust/glob-use-crate-visibility/project/src/main.rs new file mode 100644 index 00000000..7acb19ea --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-visibility/project/src/main.rs @@ -0,0 +1,8 @@ +use dep::html::*; +use other::*; + +fn main() { + render(); + save(); + load(); +} diff --git a/test/projectgraph/cases/rust/glob-use-crate-visibility/project/vendor/dep/Cargo.toml b/test/projectgraph/cases/rust/glob-use-crate-visibility/project/vendor/dep/Cargo.toml new file mode 100644 index 00000000..537b4e47 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-visibility/project/vendor/dep/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "dep" +version = "1.0.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/glob-use-crate-visibility/project/vendor/dep/src/html.rs b/test/projectgraph/cases/rust/glob-use-crate-visibility/project/vendor/dep/src/html.rs new file mode 100644 index 00000000..564ab4a9 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-visibility/project/vendor/dep/src/html.rs @@ -0,0 +1,12 @@ +use crate::inner::save; +pub(crate) use crate::inner::load; + +pub(crate) fn render() { + let _ = std::fs::remove_dir("a"); +} + +pub fn page() { + render(); + save(); + load(); +} diff --git a/test/projectgraph/cases/rust/glob-use-crate-visibility/project/vendor/dep/src/inner.rs b/test/projectgraph/cases/rust/glob-use-crate-visibility/project/vendor/dep/src/inner.rs new file mode 100644 index 00000000..87b50228 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-visibility/project/vendor/dep/src/inner.rs @@ -0,0 +1,7 @@ +pub fn save() { + let _ = std::fs::remove_dir("b"); +} + +pub fn load() { + let _ = std::fs::remove_dir("c"); +} diff --git a/test/projectgraph/cases/rust/glob-use-crate-visibility/project/vendor/dep/src/lib.rs b/test/projectgraph/cases/rust/glob-use-crate-visibility/project/vendor/dep/src/lib.rs new file mode 100644 index 00000000..83e0a91d --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-visibility/project/vendor/dep/src/lib.rs @@ -0,0 +1,2 @@ +pub mod html; +mod inner; diff --git a/test/projectgraph/cases/rust/glob-use-crate-visibility/project/vendor/other/Cargo.toml b/test/projectgraph/cases/rust/glob-use-crate-visibility/project/vendor/other/Cargo.toml new file mode 100644 index 00000000..bdb8f41b --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-visibility/project/vendor/other/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "other" +version = "1.0.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/glob-use-crate-visibility/project/vendor/other/src/lib.rs b/test/projectgraph/cases/rust/glob-use-crate-visibility/project/vendor/other/src/lib.rs new file mode 100644 index 00000000..805ffddc --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-visibility/project/vendor/other/src/lib.rs @@ -0,0 +1,5 @@ +pub fn render() {} + +pub fn save() {} + +pub fn load() {} diff --git a/test/projectgraph/cases/rust/glob-use-crate-visibility/summaries/cargo_dep_1.0.0.json b/test/projectgraph/cases/rust/glob-use-crate-visibility/summaries/cargo_dep_1.0.0.json new file mode 100644 index 00000000..cef61657 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-visibility/summaries/cargo_dep_1.0.0.json @@ -0,0 +1,30 @@ +{ + "version": "3", + "index_version": "17", + "link_version": "20", + "unit": "cargo:dep@1.0.0", + "symbols": [ + { + "key": "dep//html//page", + "definitions": [ + "cargo:dep@1.0.0//src/html.rs//page" + ], + "reaches": [] + }, + { + "key": "dep//inner//load", + "definitions": [ + "cargo:dep@1.0.0//src/inner.rs//load" + ], + "reaches": [] + }, + { + "key": "dep//inner//save", + "definitions": [ + "cargo:dep@1.0.0//src/inner.rs//save" + ], + "reaches": [] + } + ], + "targets": [] +} diff --git a/test/projectgraph/cases/rust/glob-use-crate-visibility/summaries/cargo_other_1.0.0.json b/test/projectgraph/cases/rust/glob-use-crate-visibility/summaries/cargo_other_1.0.0.json new file mode 100644 index 00000000..1b801bf5 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-crate-visibility/summaries/cargo_other_1.0.0.json @@ -0,0 +1,30 @@ +{ + "version": "3", + "index_version": "17", + "link_version": "20", + "unit": "cargo:other@1.0.0", + "symbols": [ + { + "key": "other//load", + "definitions": [ + "cargo:other@1.0.0//src/lib.rs//load" + ], + "reaches": [] + }, + { + "key": "other//render", + "definitions": [ + "cargo:other@1.0.0//src/lib.rs//render" + ], + "reaches": [] + }, + { + "key": "other//save", + "definitions": [ + "cargo:other@1.0.0//src/lib.rs//save" + ], + "reaches": [] + } + ], + "targets": [] +} diff --git a/test/projectgraph/cases/rust/glob-use-dependency-module/expect.yaml b/test/projectgraph/cases/rust/glob-use-dependency-module/expect.yaml new file mode 100644 index 00000000..3d9dfb1b --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-dependency-module/expect.yaml @@ -0,0 +1,43 @@ +source: safedep:hand +description: >- + main.rs has use dep::*, which brings the module html of the crate dep into scope, and main calls html::render. + The code of the crate dep is the unit cargo:dep@1.2.0. Rust reads a name of a glob use before a crate, so html + names dep::html and no crate html. A link step that reads html as a crate gives the call the key html//render + with no record, and dep//html//render reads not-found. Nothing calls escape, so dep//html//escape is not-found. +units: + vendor/dep: cargo:dep@1.2.0 +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +exact_edges: true +edges: + - from: src/main.rs//main + to: dep//html//render + kind: direct + confidence: high + site: src/main.rs:4 + - from: dep//html//render + to: cargo:dep@1.2.0//src/html.rs//render + kind: package + confidence: high + site: cargo:dep@1.2.0//src/html.rs:1 +unresolved: [] +results: + - target: dep//html//render + status: found + path: + - key: src/main.rs//main + - key: dep//html//render + site: src/main.rs:4 + kind: direct + confidence: high + call_sites: + - caller: src/main.rs//main + site: src/main.rs:4 + reached: true + - target: dep//html//escape + status: not-found diff --git a/test/projectgraph/cases/rust/glob-use-dependency-module/project/Cargo.toml b/test/projectgraph/cases/rust/glob-use-dependency-module/project/Cargo.toml new file mode 100644 index 00000000..56e246be --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-dependency-module/project/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" + +[dependencies] +dep = "1.2.0" diff --git a/test/projectgraph/cases/rust/glob-use-dependency-module/project/src/main.rs b/test/projectgraph/cases/rust/glob-use-dependency-module/project/src/main.rs new file mode 100644 index 00000000..8cca6efc --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-dependency-module/project/src/main.rs @@ -0,0 +1,5 @@ +use dep::*; + +fn main() { + html::render(); +} diff --git a/test/projectgraph/cases/rust/glob-use-dependency-module/project/vendor/dep/Cargo.toml b/test/projectgraph/cases/rust/glob-use-dependency-module/project/vendor/dep/Cargo.toml new file mode 100644 index 00000000..5352efc0 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-dependency-module/project/vendor/dep/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "dep" +version = "1.2.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/glob-use-dependency-module/project/vendor/dep/src/html.rs b/test/projectgraph/cases/rust/glob-use-dependency-module/project/vendor/dep/src/html.rs new file mode 100644 index 00000000..38c45e42 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-dependency-module/project/vendor/dep/src/html.rs @@ -0,0 +1,3 @@ +pub fn render() {} + +pub fn escape() {} diff --git a/test/projectgraph/cases/rust/glob-use-dependency-module/project/vendor/dep/src/lib.rs b/test/projectgraph/cases/rust/glob-use-dependency-module/project/vendor/dep/src/lib.rs new file mode 100644 index 00000000..3d4613dd --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-dependency-module/project/vendor/dep/src/lib.rs @@ -0,0 +1 @@ +pub mod html; diff --git a/test/projectgraph/cases/rust/glob-use-dependency-module/summaries/cargo_dep_1.2.0.json b/test/projectgraph/cases/rust/glob-use-dependency-module/summaries/cargo_dep_1.2.0.json new file mode 100644 index 00000000..289d7721 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-dependency-module/summaries/cargo_dep_1.2.0.json @@ -0,0 +1,23 @@ +{ + "version": "3", + "index_version": "17", + "link_version": "20", + "unit": "cargo:dep@1.2.0", + "symbols": [ + { + "key": "dep//html//escape", + "definitions": [ + "cargo:dep@1.2.0//src/html.rs//escape" + ], + "reaches": [] + }, + { + "key": "dep//html//render", + "definitions": [ + "cargo:dep@1.2.0//src/html.rs//render" + ], + "reaches": [] + } + ], + "targets": [] +} diff --git a/test/projectgraph/cases/rust/glob-use-inline-scope/expect.yaml b/test/projectgraph/cases/rust/glob-use-inline-scope/expect.yaml new file mode 100644 index 00000000..ad3616db --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-inline-scope/expect.yaml @@ -0,0 +1,54 @@ +source: safedep:hand +description: >- + main.rs has use dep::html::* at its root, and the inline module inner has use other::*. A glob use of the root + brings no name into inner, so render() in inner::go runs render of other, which calls std::fs::remove_file. + A link step that reads the glob use of the root for inner gives the call the edge to dep//html//render, so + dep//html//render reads found from inner::go. The call keeps its record of render, so both targets read + uncertain from inner::go. +units: + vendor/dep: cargo:dep@1.0.0 + vendor/other: cargo:other@1.0.0 +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/main.rs//main + to: dep//html//page + kind: direct + confidence: high + site: src/main.rs:13 +no_edges: + - from: src/main.rs//inner//go + to: dep//html//render +unresolved: + - caller: src/main.rs//inner//go + site: src/main.rs:7 + reason: unknown-receiver + method: render + - caller: src/main.rs//main + site: src/main.rs:13 + reason: unknown-receiver + method: page +results: + - target: dep//html//render + status: uncertain + sources: [src/main.rs//inner//go] + sources_only: true + call_sites: + - caller: cargo:dep@1.0.0//src/html.rs//page + site: cargo:dep@1.0.0//src/html.rs:4 + reached: false + uncertainties: + - kind: unresolved-call + site: src/main.rs:7 + - target: other//render + status: uncertain + sources: [src/main.rs//inner//go] + sources_only: true + uncertainties: + - kind: unresolved-call + site: src/main.rs:7 diff --git a/test/projectgraph/cases/rust/glob-use-inline-scope/project/Cargo.toml b/test/projectgraph/cases/rust/glob-use-inline-scope/project/Cargo.toml new file mode 100644 index 00000000..9fdab07a --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-inline-scope/project/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" + +[dependencies] +dep = "1.0.0" +other = "1.0.0" diff --git a/test/projectgraph/cases/rust/glob-use-inline-scope/project/src/main.rs b/test/projectgraph/cases/rust/glob-use-inline-scope/project/src/main.rs new file mode 100644 index 00000000..3f9d3111 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-inline-scope/project/src/main.rs @@ -0,0 +1,14 @@ +use dep::html::*; + +mod inner { + use other::*; + + pub fn go() { + render(); + } +} + +fn main() { + inner::go(); + page(); +} diff --git a/test/projectgraph/cases/rust/glob-use-inline-scope/project/vendor/dep/Cargo.toml b/test/projectgraph/cases/rust/glob-use-inline-scope/project/vendor/dep/Cargo.toml new file mode 100644 index 00000000..537b4e47 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-inline-scope/project/vendor/dep/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "dep" +version = "1.0.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/glob-use-inline-scope/project/vendor/dep/src/html.rs b/test/projectgraph/cases/rust/glob-use-inline-scope/project/vendor/dep/src/html.rs new file mode 100644 index 00000000..867bd09d --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-inline-scope/project/vendor/dep/src/html.rs @@ -0,0 +1,5 @@ +pub fn render() {} + +pub fn page() { + render(); +} diff --git a/test/projectgraph/cases/rust/glob-use-inline-scope/project/vendor/dep/src/lib.rs b/test/projectgraph/cases/rust/glob-use-inline-scope/project/vendor/dep/src/lib.rs new file mode 100644 index 00000000..3d4613dd --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-inline-scope/project/vendor/dep/src/lib.rs @@ -0,0 +1 @@ +pub mod html; diff --git a/test/projectgraph/cases/rust/glob-use-inline-scope/project/vendor/other/Cargo.toml b/test/projectgraph/cases/rust/glob-use-inline-scope/project/vendor/other/Cargo.toml new file mode 100644 index 00000000..bdb8f41b --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-inline-scope/project/vendor/other/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "other" +version = "1.0.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/glob-use-inline-scope/project/vendor/other/src/lib.rs b/test/projectgraph/cases/rust/glob-use-inline-scope/project/vendor/other/src/lib.rs new file mode 100644 index 00000000..df4d9c96 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-inline-scope/project/vendor/other/src/lib.rs @@ -0,0 +1,3 @@ +pub fn render() { + let _ = std::fs::remove_file("a"); +} diff --git a/test/projectgraph/cases/rust/glob-use-inline-scope/summaries/cargo_dep_1.0.0.json b/test/projectgraph/cases/rust/glob-use-inline-scope/summaries/cargo_dep_1.0.0.json new file mode 100644 index 00000000..7b8cd127 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-inline-scope/summaries/cargo_dep_1.0.0.json @@ -0,0 +1,23 @@ +{ + "version": "3", + "index_version": "17", + "link_version": "20", + "unit": "cargo:dep@1.0.0", + "symbols": [ + { + "key": "dep//html//page", + "definitions": [ + "cargo:dep@1.0.0//src/html.rs//page" + ], + "reaches": [] + }, + { + "key": "dep//html//render", + "definitions": [ + "cargo:dep@1.0.0//src/html.rs//render" + ], + "reaches": [] + } + ], + "targets": [] +} diff --git a/test/projectgraph/cases/rust/glob-use-inline-scope/summaries/cargo_other_1.0.0.json b/test/projectgraph/cases/rust/glob-use-inline-scope/summaries/cargo_other_1.0.0.json new file mode 100644 index 00000000..42a951d8 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-inline-scope/summaries/cargo_other_1.0.0.json @@ -0,0 +1,16 @@ +{ + "version": "3", + "index_version": "17", + "link_version": "20", + "unit": "cargo:other@1.0.0", + "symbols": [ + { + "key": "other//render", + "definitions": [ + "cargo:other@1.0.0//src/lib.rs//render" + ], + "reaches": [] + } + ], + "targets": [] +} diff --git a/test/projectgraph/cases/rust/glob-use-module-reexport/expect.yaml b/test/projectgraph/cases/rust/glob-use-module-reexport/expect.yaml new file mode 100644 index 00000000..68c296fd --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-module-reexport/expect.yaml @@ -0,0 +1,73 @@ +source: safedep:hand +description: >- + src/m0.rs has pub use dep::m::*, and src/m1.rs has pub use other::*. go calls crate::m0::run and + crate::m1::make. The unit cargo:dep@1.0.0 gives dep, and its module m defines run, so crate::m0::run names + dep::m::run. No unit gives other, so its glob use can bring any name, and crate::m1::make is a record. A link + step that reads no glob use of a module of the project for a path gives both calls the external keys + crate//m0//run and crate//m1//make with no record, and dep//m//run reads not-found. +units: + vendor/dep: cargo:dep@1.0.0 +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/ac.rs//go + to: dep//m//run + kind: direct + confidence: high + site: src/ac.rs:2 +no_edges: + - from: src/ac.rs//go + to: crate//m0//run + - from: src/ac.rs//go + to: crate//m1//make +unresolved: + - caller: src/ac.rs//go + site: src/ac.rs:3 + reason: unknown-receiver + method: crate +results: + - target: dep//m//run + status: found + path: + - key: src/main.rs//main + - key: src/ac.rs//go + site: src/main.rs:6 + kind: direct + confidence: high + - key: dep//m//run + site: src/ac.rs:2 + kind: direct + confidence: high + call_sites: + - caller: src/ac.rs//go + site: src/ac.rs:2 + reached: true + - target: std//fs//remove_file + status: found + path: + - key: src/main.rs//main + - key: src/ac.rs//go + site: src/main.rs:6 + kind: direct + confidence: high + - key: dep//m//run + site: src/ac.rs:2 + kind: direct + confidence: high + - key: cargo:dep@1.0.0//src/m.rs//run + site: cargo:dep@1.0.0//src/m.rs:1 + kind: package + confidence: high + - key: std//fs//remove_file + site: cargo:dep@1.0.0//src/m.rs:2 + kind: direct + confidence: high + call_sites: + - caller: cargo:dep@1.0.0//src/m.rs//run + site: cargo:dep@1.0.0//src/m.rs:2 + reached: true diff --git a/test/projectgraph/cases/rust/glob-use-module-reexport/project/Cargo.toml b/test/projectgraph/cases/rust/glob-use-module-reexport/project/Cargo.toml new file mode 100644 index 00000000..9fdab07a --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-module-reexport/project/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" + +[dependencies] +dep = "1.0.0" +other = "1.0.0" diff --git a/test/projectgraph/cases/rust/glob-use-module-reexport/project/src/ac.rs b/test/projectgraph/cases/rust/glob-use-module-reexport/project/src/ac.rs new file mode 100644 index 00000000..64c9477b --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-module-reexport/project/src/ac.rs @@ -0,0 +1,4 @@ +pub fn go() { + crate::m0::run(); + crate::m1::make(); +} diff --git a/test/projectgraph/cases/rust/glob-use-module-reexport/project/src/m0.rs b/test/projectgraph/cases/rust/glob-use-module-reexport/project/src/m0.rs new file mode 100644 index 00000000..24412ca2 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-module-reexport/project/src/m0.rs @@ -0,0 +1 @@ +pub use dep::m::*; diff --git a/test/projectgraph/cases/rust/glob-use-module-reexport/project/src/m1.rs b/test/projectgraph/cases/rust/glob-use-module-reexport/project/src/m1.rs new file mode 100644 index 00000000..6aecbee9 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-module-reexport/project/src/m1.rs @@ -0,0 +1 @@ +pub use other::*; diff --git a/test/projectgraph/cases/rust/glob-use-module-reexport/project/src/main.rs b/test/projectgraph/cases/rust/glob-use-module-reexport/project/src/main.rs new file mode 100644 index 00000000..c2be9ba7 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-module-reexport/project/src/main.rs @@ -0,0 +1,7 @@ +mod ac; +mod m0; +mod m1; + +fn main() { + ac::go(); +} diff --git a/test/projectgraph/cases/rust/glob-use-module-reexport/project/vendor/dep/Cargo.toml b/test/projectgraph/cases/rust/glob-use-module-reexport/project/vendor/dep/Cargo.toml new file mode 100644 index 00000000..537b4e47 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-module-reexport/project/vendor/dep/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "dep" +version = "1.0.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/glob-use-module-reexport/project/vendor/dep/src/lib.rs b/test/projectgraph/cases/rust/glob-use-module-reexport/project/vendor/dep/src/lib.rs new file mode 100644 index 00000000..ef2bf252 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-module-reexport/project/vendor/dep/src/lib.rs @@ -0,0 +1 @@ +pub mod m; diff --git a/test/projectgraph/cases/rust/glob-use-module-reexport/project/vendor/dep/src/m.rs b/test/projectgraph/cases/rust/glob-use-module-reexport/project/vendor/dep/src/m.rs new file mode 100644 index 00000000..487b2a48 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-module-reexport/project/vendor/dep/src/m.rs @@ -0,0 +1,3 @@ +pub fn run() { + let _ = std::fs::remove_file("x"); +} diff --git a/test/projectgraph/cases/rust/glob-use-module-reexport/summaries/cargo_dep_1.0.0.json b/test/projectgraph/cases/rust/glob-use-module-reexport/summaries/cargo_dep_1.0.0.json new file mode 100644 index 00000000..7d589c81 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-module-reexport/summaries/cargo_dep_1.0.0.json @@ -0,0 +1,16 @@ +{ + "version": "3", + "index_version": "17", + "link_version": "20", + "unit": "cargo:dep@1.0.0", + "symbols": [ + { + "key": "dep//m//run", + "definitions": [ + "cargo:dep@1.0.0//src/m.rs//run" + ], + "reaches": [] + } + ], + "targets": [] +} diff --git a/test/projectgraph/cases/rust/glob-use-private-item/expect.yaml b/test/projectgraph/cases/rust/glob-use-private-item/expect.yaml new file mode 100644 index 00000000..5cce1f4e --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-item/expect.yaml @@ -0,0 +1,60 @@ +source: safedep:hand +description: >- + main.rs has use dep::html::* and use other::*, and calls render() and util::run(). dep::html defines render + and the module util, both private, so the glob use of dep::html brings neither. other gives the pub function + render and the pub module util. So both calls run code of other: render calls std::fs::remove_file and + util::run calls std::fs::remove_dir. A link step that takes a private item of a unit for a name of a glob use + sends render() to dep//html//render and util::run() to dep//html//util//run, so std::fs::remove_dir reads + not-found. render() keeps its record, because a closure or a parameter can bind a single name. +units: + vendor/dep: cargo:dep@1.0.0 + vendor/other: cargo:other@1.0.0 +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/main.rs//main + to: other//render + kind: direct + confidence: high + site: src/main.rs:5 + - from: src/main.rs//main + to: other//util//run + kind: direct + confidence: high + site: src/main.rs:6 +no_edges: + - from: src/main.rs//main + to: dep//html//render + - from: src/main.rs//main + to: dep//html//util//run +unresolved: + - caller: src/main.rs//main + site: src/main.rs:5 + reason: unknown-receiver + method: render +results: + - target: std//fs//remove_dir + status: found + path: + - key: src/main.rs//main + - key: other//util//run + site: src/main.rs:6 + kind: direct + confidence: high + - key: cargo:other@1.0.0//src/util.rs//run + site: cargo:other@1.0.0//src/util.rs:1 + kind: package + confidence: high + - key: std//fs//remove_dir + site: cargo:other@1.0.0//src/util.rs:2 + kind: direct + confidence: high + call_sites: + - caller: cargo:other@1.0.0//src/util.rs//run + site: cargo:other@1.0.0//src/util.rs:2 + reached: true diff --git a/test/projectgraph/cases/rust/glob-use-private-item/project/Cargo.toml b/test/projectgraph/cases/rust/glob-use-private-item/project/Cargo.toml new file mode 100644 index 00000000..9fdab07a --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-item/project/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" + +[dependencies] +dep = "1.0.0" +other = "1.0.0" diff --git a/test/projectgraph/cases/rust/glob-use-private-item/project/src/main.rs b/test/projectgraph/cases/rust/glob-use-private-item/project/src/main.rs new file mode 100644 index 00000000..65967194 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-item/project/src/main.rs @@ -0,0 +1,7 @@ +use dep::html::*; +use other::*; + +fn main() { + render(); + util::run(); +} diff --git a/test/projectgraph/cases/rust/glob-use-private-item/project/vendor/dep/Cargo.toml b/test/projectgraph/cases/rust/glob-use-private-item/project/vendor/dep/Cargo.toml new file mode 100644 index 00000000..537b4e47 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-item/project/vendor/dep/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "dep" +version = "1.0.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/glob-use-private-item/project/vendor/dep/src/html.rs b/test/projectgraph/cases/rust/glob-use-private-item/project/vendor/dep/src/html.rs new file mode 100644 index 00000000..7f5fde2d --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-item/project/vendor/dep/src/html.rs @@ -0,0 +1,11 @@ +mod util { + pub fn run() {} +} + +fn render() { + util::run(); +} + +pub fn page() { + render(); +} diff --git a/test/projectgraph/cases/rust/glob-use-private-item/project/vendor/dep/src/lib.rs b/test/projectgraph/cases/rust/glob-use-private-item/project/vendor/dep/src/lib.rs new file mode 100644 index 00000000..3d4613dd --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-item/project/vendor/dep/src/lib.rs @@ -0,0 +1 @@ +pub mod html; diff --git a/test/projectgraph/cases/rust/glob-use-private-item/project/vendor/other/Cargo.toml b/test/projectgraph/cases/rust/glob-use-private-item/project/vendor/other/Cargo.toml new file mode 100644 index 00000000..bdb8f41b --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-item/project/vendor/other/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "other" +version = "1.0.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/glob-use-private-item/project/vendor/other/src/lib.rs b/test/projectgraph/cases/rust/glob-use-private-item/project/vendor/other/src/lib.rs new file mode 100644 index 00000000..37d3042b --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-item/project/vendor/other/src/lib.rs @@ -0,0 +1,5 @@ +pub mod util; + +pub fn render() { + let _ = std::fs::remove_file("a"); +} diff --git a/test/projectgraph/cases/rust/glob-use-private-item/project/vendor/other/src/util.rs b/test/projectgraph/cases/rust/glob-use-private-item/project/vendor/other/src/util.rs new file mode 100644 index 00000000..3b282c10 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-item/project/vendor/other/src/util.rs @@ -0,0 +1,3 @@ +pub fn run() { + let _ = std::fs::remove_dir("a"); +} diff --git a/test/projectgraph/cases/rust/glob-use-private-item/summaries/cargo_dep_1.0.0.json b/test/projectgraph/cases/rust/glob-use-private-item/summaries/cargo_dep_1.0.0.json new file mode 100644 index 00000000..8ecf12d4 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-item/summaries/cargo_dep_1.0.0.json @@ -0,0 +1,23 @@ +{ + "version": "3", + "index_version": "17", + "link_version": "20", + "unit": "cargo:dep@1.0.0", + "symbols": [ + { + "key": "dep//html//page", + "definitions": [ + "cargo:dep@1.0.0//src/html.rs//page" + ], + "reaches": [] + }, + { + "key": "dep//html//util//run", + "definitions": [ + "cargo:dep@1.0.0//src/html.rs//util//run" + ], + "reaches": [] + } + ], + "targets": [] +} diff --git a/test/projectgraph/cases/rust/glob-use-private-item/summaries/cargo_other_1.0.0.json b/test/projectgraph/cases/rust/glob-use-private-item/summaries/cargo_other_1.0.0.json new file mode 100644 index 00000000..5992e56d --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-item/summaries/cargo_other_1.0.0.json @@ -0,0 +1,23 @@ +{ + "version": "3", + "index_version": "17", + "link_version": "20", + "unit": "cargo:other@1.0.0", + "symbols": [ + { + "key": "other//render", + "definitions": [ + "cargo:other@1.0.0//src/lib.rs//render" + ], + "reaches": [] + }, + { + "key": "other//util//run", + "definitions": [ + "cargo:other@1.0.0//src/util.rs//run" + ], + "reaches": [] + } + ], + "targets": [] +} diff --git a/test/projectgraph/cases/rust/glob-use-private-module/expect.yaml b/test/projectgraph/cases/rust/glob-use-private-module/expect.yaml new file mode 100644 index 00000000..3589d9da --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-module/expect.yaml @@ -0,0 +1,80 @@ +source: safedep:hand +description: >- + main.rs has use dep::* and use other::*, and calls hidden::run(). dep declares mod hidden; with no pub, and + other declares pub mod hidden;. Each hidden is a file of its own with a pub run. Another crate sees only the + hidden of other, so the call runs other::hidden::run, which calls std::fs::remove_file. A link step that takes + the file of a child module for an export gives the call the edge to dep::hidden::run, and std::fs::remove_dir + reads found. The crate also declares the private mod inner;, and src/user.rs has use crate::*. A glob use in + the same crate brings a private module, so inner::go() runs and std::fs::create_dir reads found. +units: + vendor/dep: cargo:dep@1.0.0 + vendor/other: cargo:other@1.0.0 +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/main.rs//main + to: other//hidden//run + kind: direct + confidence: high + site: src/main.rs:8 + - from: src/user.rs//call + to: src/inner.rs//go + kind: direct + confidence: high + site: src/user.rs:4 +no_edges: + - from: src/main.rs//main + to: dep//hidden//run +unresolved: [] +results: + - target: std//fs//remove_file + status: found + path: + - key: src/main.rs//main + - key: other//hidden//run + site: src/main.rs:8 + kind: direct + confidence: high + - key: cargo:other@1.0.0//src/hidden.rs//run + site: cargo:other@1.0.0//src/hidden.rs:1 + kind: package + confidence: high + - key: std//fs//remove_file + site: cargo:other@1.0.0//src/hidden.rs:2 + kind: direct + confidence: high + call_sites: + - caller: cargo:other@1.0.0//src/hidden.rs//run + site: cargo:other@1.0.0//src/hidden.rs:2 + reached: true + - target: std//fs//remove_dir + status: not-found + call_sites: + - caller: cargo:dep@1.0.0//src/hidden.rs//run + site: cargo:dep@1.0.0//src/hidden.rs:2 + reached: false + - target: std//fs//create_dir + status: found + path: + - key: src/main.rs//main + - key: src/user.rs//call + site: src/main.rs:9 + kind: direct + confidence: high + - key: src/inner.rs//go + site: src/user.rs:4 + kind: direct + confidence: high + - key: std//fs//create_dir + site: src/inner.rs:2 + kind: direct + confidence: high + call_sites: + - caller: src/inner.rs//go + site: src/inner.rs:2 + reached: true diff --git a/test/projectgraph/cases/rust/glob-use-private-module/project/Cargo.toml b/test/projectgraph/cases/rust/glob-use-private-module/project/Cargo.toml new file mode 100644 index 00000000..9fdab07a --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-module/project/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" + +[dependencies] +dep = "1.0.0" +other = "1.0.0" diff --git a/test/projectgraph/cases/rust/glob-use-private-module/project/src/inner.rs b/test/projectgraph/cases/rust/glob-use-private-module/project/src/inner.rs new file mode 100644 index 00000000..6943ce58 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-module/project/src/inner.rs @@ -0,0 +1,3 @@ +pub fn go() { + let _ = std::fs::create_dir("inner"); +} diff --git a/test/projectgraph/cases/rust/glob-use-private-module/project/src/main.rs b/test/projectgraph/cases/rust/glob-use-private-module/project/src/main.rs new file mode 100644 index 00000000..ca78d0a5 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-module/project/src/main.rs @@ -0,0 +1,10 @@ +use dep::*; +use other::*; + +mod inner; +mod user; + +fn main() { + hidden::run(); + user::call(); +} diff --git a/test/projectgraph/cases/rust/glob-use-private-module/project/src/user.rs b/test/projectgraph/cases/rust/glob-use-private-module/project/src/user.rs new file mode 100644 index 00000000..15e758ec --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-module/project/src/user.rs @@ -0,0 +1,5 @@ +use crate::*; + +pub fn call() { + inner::go(); +} diff --git a/test/projectgraph/cases/rust/glob-use-private-module/project/vendor/dep/Cargo.toml b/test/projectgraph/cases/rust/glob-use-private-module/project/vendor/dep/Cargo.toml new file mode 100644 index 00000000..537b4e47 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-module/project/vendor/dep/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "dep" +version = "1.0.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/glob-use-private-module/project/vendor/dep/src/hidden.rs b/test/projectgraph/cases/rust/glob-use-private-module/project/vendor/dep/src/hidden.rs new file mode 100644 index 00000000..6aae9b64 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-module/project/vendor/dep/src/hidden.rs @@ -0,0 +1,3 @@ +pub fn run() { + let _ = std::fs::remove_dir("dep"); +} diff --git a/test/projectgraph/cases/rust/glob-use-private-module/project/vendor/dep/src/lib.rs b/test/projectgraph/cases/rust/glob-use-private-module/project/vendor/dep/src/lib.rs new file mode 100644 index 00000000..855515ee --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-module/project/vendor/dep/src/lib.rs @@ -0,0 +1,5 @@ +mod hidden; + +pub fn top() { + hidden::run(); +} diff --git a/test/projectgraph/cases/rust/glob-use-private-module/project/vendor/other/Cargo.toml b/test/projectgraph/cases/rust/glob-use-private-module/project/vendor/other/Cargo.toml new file mode 100644 index 00000000..bdb8f41b --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-module/project/vendor/other/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "other" +version = "1.0.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/glob-use-private-module/project/vendor/other/src/hidden.rs b/test/projectgraph/cases/rust/glob-use-private-module/project/vendor/other/src/hidden.rs new file mode 100644 index 00000000..21b70501 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-module/project/vendor/other/src/hidden.rs @@ -0,0 +1,3 @@ +pub fn run() { + let _ = std::fs::remove_file("other"); +} diff --git a/test/projectgraph/cases/rust/glob-use-private-module/project/vendor/other/src/lib.rs b/test/projectgraph/cases/rust/glob-use-private-module/project/vendor/other/src/lib.rs new file mode 100644 index 00000000..d57cf3c3 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-module/project/vendor/other/src/lib.rs @@ -0,0 +1 @@ +pub mod hidden; diff --git a/test/projectgraph/cases/rust/glob-use-private-module/summaries/cargo_dep_1.0.0.json b/test/projectgraph/cases/rust/glob-use-private-module/summaries/cargo_dep_1.0.0.json new file mode 100644 index 00000000..2cbb6844 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-module/summaries/cargo_dep_1.0.0.json @@ -0,0 +1,23 @@ +{ + "version": "3", + "index_version": "17", + "link_version": "20", + "unit": "cargo:dep@1.0.0", + "symbols": [ + { + "key": "dep//hidden//run", + "definitions": [ + "cargo:dep@1.0.0//src/hidden.rs//run" + ], + "reaches": [] + }, + { + "key": "dep//top", + "definitions": [ + "cargo:dep@1.0.0//src/lib.rs//top" + ], + "reaches": [] + } + ], + "targets": [] +} diff --git a/test/projectgraph/cases/rust/glob-use-private-module/summaries/cargo_other_1.0.0.json b/test/projectgraph/cases/rust/glob-use-private-module/summaries/cargo_other_1.0.0.json new file mode 100644 index 00000000..fd11bf20 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-private-module/summaries/cargo_other_1.0.0.json @@ -0,0 +1,16 @@ +{ + "version": "3", + "index_version": "17", + "link_version": "20", + "unit": "cargo:other@1.0.0", + "symbols": [ + { + "key": "other//hidden//run", + "definitions": [ + "cargo:other@1.0.0//src/hidden.rs//run" + ], + "reaches": [] + } + ], + "targets": [] +} diff --git a/test/projectgraph/cases/rust/glob-use-reexport/expect.yaml b/test/projectgraph/cases/rust/glob-use-reexport/expect.yaml new file mode 100644 index 00000000..b81af259 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-reexport/expect.yaml @@ -0,0 +1,91 @@ +source: safedep:hand +description: >- + The crate dep, the unit cargo:dep@1.0.0, has pub use inner::* and pub use crate::sub::* at its root, and its + module prelude has pub use inner::tools. inner is the unit cargo:inner@1.0.0. src/a.rs has use dep::*, so text + names the module text of inner and leaf names the module sub::leaf of dep. src/b.rs has use dep::prelude::*, so + tools names the module tools of inner. A link step that reads no name that a unit brings from another crate or + by its own glob use reads each first name as a crate, gives each call an external key with no record, and + each target reads not-found. +units: + vendor/dep: cargo:dep@1.0.0 + vendor/inner: cargo:inner@1.0.0 +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +no_edges: + - from: src/a.rs//go + to: text//fmt + - from: src/a.rs//go + to: leaf//leaffn + - from: src/b.rs//go + to: tools//run +edges: + - from: src/a.rs//go + to: dep//text//fmt + kind: direct + confidence: high + site: src/a.rs:4 + - from: src/a.rs//go + to: dep//leaf//leaffn + kind: direct + confidence: high + site: src/a.rs:5 + - from: src/b.rs//go + to: dep//prelude//tools//run + kind: direct + confidence: high + site: src/b.rs:4 +unresolved: [] +results: + - target: inner//text//fmt + status: found + path: + - key: src/main.rs//main + - key: src/a.rs//go + site: src/main.rs:5 + kind: direct + confidence: high + - key: dep//text//fmt + site: src/a.rs:4 + kind: direct + confidence: high + - key: inner//text//fmt + site: cargo:dep@1.0.0 + kind: package + confidence: high + - target: dep//sub//leaf//leaffn + status: found + path: + - key: src/main.rs//main + - key: src/a.rs//go + site: src/main.rs:5 + kind: direct + confidence: high + - key: dep//leaf//leaffn + site: src/a.rs:5 + kind: direct + confidence: high + - key: cargo:dep@1.0.0//src/sub/leaf.rs//leaffn + site: cargo:dep@1.0.0//src/sub/leaf.rs:1 + kind: package + confidence: high + - target: inner//tools//run + status: found + path: + - key: src/main.rs//main + - key: src/b.rs//go + site: src/main.rs:6 + kind: direct + confidence: high + - key: dep//prelude//tools//run + site: src/b.rs:4 + kind: direct + confidence: high + - key: inner//tools//run + site: cargo:dep@1.0.0 + kind: package + confidence: high diff --git a/test/projectgraph/cases/rust/glob-use-reexport/project/Cargo.toml b/test/projectgraph/cases/rust/glob-use-reexport/project/Cargo.toml new file mode 100644 index 00000000..730014fa --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-reexport/project/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" + +[dependencies] +dep = "1.0.0" diff --git a/test/projectgraph/cases/rust/glob-use-reexport/project/src/a.rs b/test/projectgraph/cases/rust/glob-use-reexport/project/src/a.rs new file mode 100644 index 00000000..a5c145db --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-reexport/project/src/a.rs @@ -0,0 +1,6 @@ +use dep::*; + +pub fn go() { + text::fmt(); + leaf::leaffn(); +} diff --git a/test/projectgraph/cases/rust/glob-use-reexport/project/src/b.rs b/test/projectgraph/cases/rust/glob-use-reexport/project/src/b.rs new file mode 100644 index 00000000..947ff664 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-reexport/project/src/b.rs @@ -0,0 +1,5 @@ +use dep::prelude::*; + +pub fn go() { + tools::run(); +} diff --git a/test/projectgraph/cases/rust/glob-use-reexport/project/src/main.rs b/test/projectgraph/cases/rust/glob-use-reexport/project/src/main.rs new file mode 100644 index 00000000..efffd961 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-reexport/project/src/main.rs @@ -0,0 +1,7 @@ +mod a; +mod b; + +fn main() { + a::go(); + b::go(); +} diff --git a/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/dep/Cargo.toml b/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/dep/Cargo.toml new file mode 100644 index 00000000..aa3a92c9 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/dep/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "dep" +version = "1.0.0" +edition = "2021" + +[dependencies] +inner = "1.0.0" diff --git a/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/dep/src/lib.rs b/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/dep/src/lib.rs new file mode 100644 index 00000000..e8734edf --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/dep/src/lib.rs @@ -0,0 +1,5 @@ +pub use inner::*; +pub use crate::sub::*; + +pub mod prelude; +pub mod sub; diff --git a/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/dep/src/prelude.rs b/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/dep/src/prelude.rs new file mode 100644 index 00000000..73518714 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/dep/src/prelude.rs @@ -0,0 +1 @@ +pub use inner::tools; diff --git a/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/dep/src/sub/leaf.rs b/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/dep/src/sub/leaf.rs new file mode 100644 index 00000000..5dc8e4c7 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/dep/src/sub/leaf.rs @@ -0,0 +1 @@ +pub fn leaffn() {} diff --git a/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/dep/src/sub/mod.rs b/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/dep/src/sub/mod.rs new file mode 100644 index 00000000..dccc7636 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/dep/src/sub/mod.rs @@ -0,0 +1 @@ +pub mod leaf; diff --git a/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/inner/Cargo.toml b/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/inner/Cargo.toml new file mode 100644 index 00000000..639ae42c --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/inner/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "inner" +version = "1.0.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/inner/src/lib.rs b/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/inner/src/lib.rs new file mode 100644 index 00000000..a82a680d --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/inner/src/lib.rs @@ -0,0 +1,2 @@ +pub mod text; +pub mod tools; diff --git a/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/inner/src/text.rs b/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/inner/src/text.rs new file mode 100644 index 00000000..5bab887c --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/inner/src/text.rs @@ -0,0 +1 @@ +pub fn fmt() {} diff --git a/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/inner/src/tools.rs b/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/inner/src/tools.rs new file mode 100644 index 00000000..fec4af15 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-reexport/project/vendor/inner/src/tools.rs @@ -0,0 +1 @@ +pub fn run() {} diff --git a/test/projectgraph/cases/rust/glob-use-reexport/summaries/cargo_dep_1.0.0.json b/test/projectgraph/cases/rust/glob-use-reexport/summaries/cargo_dep_1.0.0.json new file mode 100644 index 00000000..dc24eb1d --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-reexport/summaries/cargo_dep_1.0.0.json @@ -0,0 +1,16 @@ +{ + "version": "3", + "index_version": "17", + "link_version": "20", + "unit": "cargo:dep@1.0.0", + "symbols": [ + { + "key": "dep//sub//leaf//leaffn", + "definitions": [ + "cargo:dep@1.0.0//src/sub/leaf.rs//leaffn" + ], + "reaches": [] + } + ], + "targets": [] +} diff --git a/test/projectgraph/cases/rust/glob-use-reexport/summaries/cargo_inner_1.0.0.json b/test/projectgraph/cases/rust/glob-use-reexport/summaries/cargo_inner_1.0.0.json new file mode 100644 index 00000000..e3881cb5 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-reexport/summaries/cargo_inner_1.0.0.json @@ -0,0 +1,23 @@ +{ + "version": "3", + "index_version": "17", + "link_version": "20", + "unit": "cargo:inner@1.0.0", + "symbols": [ + { + "key": "inner//text//fmt", + "definitions": [ + "cargo:inner@1.0.0//src/text.rs//fmt" + ], + "reaches": [] + }, + { + "key": "inner//tools//run", + "definitions": [ + "cargo:inner@1.0.0//src/tools.rs//run" + ], + "reaches": [] + } + ], + "targets": [] +} diff --git a/test/projectgraph/cases/rust/glob-use-stale-visit/expect.yaml b/test/projectgraph/cases/rust/glob-use-stale-visit/expect.yaml new file mode 100644 index 00000000..795d412d --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-stale-visit/expect.yaml @@ -0,0 +1,40 @@ +source: safedep:hand +description: >- + The modules a, b, c, d, e and hub bring each other's names with glob uses, and leaf defines f. main first + calls e::f(), whose lookup reads c, hub, a, leaf and b, and then other::go() calls crate::d::f(). d brings f + through b, a and hub from leaf. The first lookup reads b while hub is in progress and finds no f there, so the + answer of b is not whole. A link step that keeps that answer of b for the lookup of d, under another depth, + keeps the lookup of d with no f for the build, and std::fs::remove_file reads not-found from other::go. +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/other.rs//go + to: src/leaf.rs//f + kind: direct + confidence: high + site: src/other.rs:2 +unresolved: [] +results: + - target: std//fs//remove_file + status: found + sources: [src/other.rs//go] + sources_only: true + path: + - key: src/other.rs//go + - key: src/leaf.rs//f + site: src/other.rs:2 + kind: direct + confidence: high + - key: std//fs//remove_file + site: src/leaf.rs:2 + kind: direct + confidence: high + call_sites: + - caller: src/leaf.rs//f + site: src/leaf.rs:2 + reached: true diff --git a/test/projectgraph/cases/rust/glob-use-stale-visit/project/Cargo.toml b/test/projectgraph/cases/rust/glob-use-stale-visit/project/Cargo.toml new file mode 100644 index 00000000..305c41cb --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-stale-visit/project/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "app" +version = "1.0.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/a.rs b/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/a.rs new file mode 100644 index 00000000..c96a8934 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/a.rs @@ -0,0 +1 @@ +pub use crate::hub::*; diff --git a/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/b.rs b/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/b.rs new file mode 100644 index 00000000..ecd3bddd --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/b.rs @@ -0,0 +1 @@ +pub use crate::a::*; diff --git a/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/c.rs b/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/c.rs new file mode 100644 index 00000000..9288b729 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/c.rs @@ -0,0 +1,2 @@ +pub use crate::hub::*; +pub use crate::b::*; diff --git a/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/d.rs b/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/d.rs new file mode 100644 index 00000000..e6586633 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/d.rs @@ -0,0 +1 @@ +pub use crate::b::*; diff --git a/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/e.rs b/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/e.rs new file mode 100644 index 00000000..a3122f94 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/e.rs @@ -0,0 +1 @@ +pub use crate::c::*; diff --git a/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/hub.rs b/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/hub.rs new file mode 100644 index 00000000..b40036e2 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/hub.rs @@ -0,0 +1,2 @@ +pub use crate::a::*; +pub use crate::leaf::*; diff --git a/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/leaf.rs b/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/leaf.rs new file mode 100644 index 00000000..723fa28f --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/leaf.rs @@ -0,0 +1,3 @@ +pub fn f() { + let _ = std::fs::remove_file("a"); +} diff --git a/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/main.rs b/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/main.rs new file mode 100644 index 00000000..e5c84785 --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/main.rs @@ -0,0 +1,13 @@ +mod a; +mod b; +mod c; +mod d; +mod e; +mod hub; +mod leaf; +mod other; + +fn main() { + e::f(); + other::go(); +} diff --git a/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/other.rs b/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/other.rs new file mode 100644 index 00000000..ca65a72d --- /dev/null +++ b/test/projectgraph/cases/rust/glob-use-stale-visit/project/src/other.rs @@ -0,0 +1,3 @@ +pub fn go() { + crate::d::f(); +} diff --git a/test/projectgraph/cases/rust/glob-use/expect.yaml b/test/projectgraph/cases/rust/glob-use/expect.yaml index 843d7711..116d5afd 100644 --- a/test/projectgraph/cases/rust/glob-use/expect.yaml +++ b/test/projectgraph/cases/rust/glob-use/expect.yaml @@ -1,9 +1,9 @@ source: safedep:hand description: >- The case of the vet reach corpus rust/glob-use. main brings in every item of the module dep::html with a glob use - and calls render. The code of the crate dep is the unit cargo:dep@1.2.0. The link step does not resolve a name - that a glob use of a module of a unit brings in, so the call stays a record of the method render. The record makes - render uncertain, and not not-found. No record names escape, so escape is not-found. + and calls render. The code of the crate dep is the unit cargo:dep@1.2.0, which gives render in that module, so the + call gets the edge to dep//html//render and its package edge. A local closure or a parameter can also bind a + single name, so the call keeps its record of the method render. Nothing calls escape, so escape is not-found. units: vendor/dep: cargo:dep@1.2.0 roots: @@ -14,6 +14,17 @@ roots: kind: main rule: rust.main exact_edges: true +edges: + - from: src/main.rs//main + to: dep//html//render + kind: direct + confidence: high + site: src/main.rs:4 + - from: dep//html//render + to: cargo:dep@1.2.0//src/html.rs//render + kind: package + confidence: high + site: cargo:dep@1.2.0//src/html.rs:1 unresolved: - caller: src/main.rs//main site: src/main.rs:4 @@ -21,9 +32,16 @@ unresolved: method: render results: - target: dep//html//render - status: uncertain - uncertainties: - - kind: unresolved-call + status: found + path: + - key: src/main.rs//main + - key: dep//html//render + site: src/main.rs:4 + kind: direct + confidence: high + call_sites: + - caller: src/main.rs//main site: src/main.rs:4 + reached: true - target: dep//html//escape status: not-found diff --git a/test/projectgraph/cases/rust/glob-use/summaries/cargo_dep_1.2.0.json b/test/projectgraph/cases/rust/glob-use/summaries/cargo_dep_1.2.0.json index 9e9f91b1..289d7721 100644 --- a/test/projectgraph/cases/rust/glob-use/summaries/cargo_dep_1.2.0.json +++ b/test/projectgraph/cases/rust/glob-use/summaries/cargo_dep_1.2.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "cargo:dep@1.2.0", "symbols": [ { diff --git a/test/projectgraph/cases/rust/inline-module-types/expect.yaml b/test/projectgraph/cases/rust/inline-module-types/expect.yaml new file mode 100644 index 00000000..0ab581f2 --- /dev/null +++ b/test/projectgraph/cases/rust/inline-module-types/expect.yaml @@ -0,0 +1,69 @@ +source: safedep:hand +description: >- + src/store.rs declares the structs Holder and Item at its top level, and the inline module cache declares its + own Holder and Item. In cache, the field item of Holder, the result of make and the struct expression + Holder { .. } name the types of cache. So h.item.save() and make().save() run cache::Item::save, which calls + std::fs::create_dir. The save of the top level calls std::fs::write and nothing calls it. A link step that + resolves these names at the root of the file sends both calls to the save of the top level, so + std::fs::create_dir reads not-found and std::fs::write reads found. +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/store.rs//cache//go + to: src/store.rs//cache//Holder + kind: direct + confidence: high + site: src/store.rs:31 + - from: src/store.rs//cache//go + to: src/store.rs//cache//Item//save + kind: member + confidence: high + site: src/store.rs:32 + - from: src/store.rs//cache//go + to: src/store.rs//cache//make + kind: direct + confidence: high + site: src/store.rs:33 + - from: src/store.rs//cache//go + to: src/store.rs//cache//Item//save + kind: member + confidence: high + site: src/store.rs:33 +no_edges: + - from: src/store.rs//cache//go + to: src/store.rs//Item//save + - from: src/store.rs//cache//go + to: src/store.rs//Holder +unresolved: [] +results: + - target: std//fs//create_dir + status: found + path: + - key: src/main.rs//main + - key: src/store.rs//cache//go + site: src/main.rs:4 + kind: direct + confidence: high + - key: src/store.rs//cache//Item//save + site: src/store.rs:32 + kind: member + confidence: high + - key: std//fs//create_dir + site: src/store.rs:18 + kind: direct + confidence: high + call_sites: + - caller: src/store.rs//cache//Item//save + site: src/store.rs:18 + reached: true + - target: std//fs//write + status: not-found + call_sites: + - caller: src/store.rs//Item//save + site: src/store.rs:5 + reached: false diff --git a/test/projectgraph/cases/rust/inline-module-types/project/Cargo.toml b/test/projectgraph/cases/rust/inline-module-types/project/Cargo.toml new file mode 100644 index 00000000..0d44349a --- /dev/null +++ b/test/projectgraph/cases/rust/inline-module-types/project/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/inline-module-types/project/src/main.rs b/test/projectgraph/cases/rust/inline-module-types/project/src/main.rs new file mode 100644 index 00000000..fea7b954 --- /dev/null +++ b/test/projectgraph/cases/rust/inline-module-types/project/src/main.rs @@ -0,0 +1,5 @@ +mod store; + +fn main() { + store::cache::go(); +} diff --git a/test/projectgraph/cases/rust/inline-module-types/project/src/store.rs b/test/projectgraph/cases/rust/inline-module-types/project/src/store.rs new file mode 100644 index 00000000..8f26e808 --- /dev/null +++ b/test/projectgraph/cases/rust/inline-module-types/project/src/store.rs @@ -0,0 +1,35 @@ +pub struct Item; + +impl Item { + pub fn save(&self) { + let _ = std::fs::write("top", "x"); + } +} + +pub struct Holder { + pub item: Item, +} + +pub mod cache { + pub struct Item; + + impl Item { + pub fn save(&self) { + let _ = std::fs::create_dir("cache"); + } + } + + pub struct Holder { + pub item: Item, + } + + pub fn make() -> Item { + Item + } + + pub fn go() { + let h = Holder { item: Item }; + h.item.save(); + make().save(); + } +} diff --git a/test/projectgraph/cases/rust/into-dependency/summaries/cargo_kit_1.0.0.json b/test/projectgraph/cases/rust/into-dependency/summaries/cargo_kit_1.0.0.json index 61ee1f2d..8f5ad891 100644 --- a/test/projectgraph/cases/rust/into-dependency/summaries/cargo_kit_1.0.0.json +++ b/test/projectgraph/cases/rust/into-dependency/summaries/cargo_kit_1.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "cargo:kit@1.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/rust/let-same-constructor/expect.yaml b/test/projectgraph/cases/rust/let-same-constructor/expect.yaml new file mode 100644 index 00000000..83153a2d --- /dev/null +++ b/test/projectgraph/cases/rust/let-same-constructor/expect.yaml @@ -0,0 +1,31 @@ +source: safedep:hand +description: >- + go binds t to A::new(), drops it, binds t again to A::new() and calls t.run(). A and B are types of + src/types.rs. Both lets call the same function of the same type, so t holds an A at the call, and the call + keeps the target A::run of the call graph. An index that knows the result of a function only in the file of + the call makes the call a record, and B::run, whose std::fs::remove_dir nothing calls, reads found through the + low name edges of run. +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/main.rs//go + to: src/types.rs//A//run + kind: member + confidence: high + site: src/main.rs:9 +no_edges: + - from: src/main.rs//go + to: src/types.rs//B//run +unresolved: [] +results: + - target: std//fs//remove_dir + status: not-found + call_sites: + - caller: src/types.rs//B//run + site: src/types.rs:20 + reached: false diff --git a/test/projectgraph/cases/rust/let-same-constructor/project/Cargo.toml b/test/projectgraph/cases/rust/let-same-constructor/project/Cargo.toml new file mode 100644 index 00000000..0d44349a --- /dev/null +++ b/test/projectgraph/cases/rust/let-same-constructor/project/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/let-same-constructor/project/src/main.rs b/test/projectgraph/cases/rust/let-same-constructor/project/src/main.rs new file mode 100644 index 00000000..d7982161 --- /dev/null +++ b/test/projectgraph/cases/rust/let-same-constructor/project/src/main.rs @@ -0,0 +1,15 @@ +mod types; + +use types::A; + +fn go() { + let t = A::new(); + drop(t); + let t = A::new(); + t.run(); +} + +fn main() { + go(); + let _ = types::B::new(); +} diff --git a/test/projectgraph/cases/rust/let-same-constructor/project/src/types.rs b/test/projectgraph/cases/rust/let-same-constructor/project/src/types.rs new file mode 100644 index 00000000..2f48e0ea --- /dev/null +++ b/test/projectgraph/cases/rust/let-same-constructor/project/src/types.rs @@ -0,0 +1,22 @@ +pub struct A; +pub struct B; + +impl A { + pub fn new() -> A { + A + } + + pub fn run(&self) { + let _ = std::fs::remove_file("a"); + } +} + +impl B { + pub fn new() -> B { + B + } + + pub fn run(&self) { + let _ = std::fs::remove_dir("b"); + } +} diff --git a/test/projectgraph/cases/rust/let-same-type/expect.yaml b/test/projectgraph/cases/rust/let-same-type/expect.yaml new file mode 100644 index 00000000..8cf21099 --- /dev/null +++ b/test/projectgraph/cases/rust/let-same-type/expect.yaml @@ -0,0 +1,44 @@ +source: safedep:hand +description: >- + builder binds c to Client::new(), then binds c again to c.with_retry(), which returns a Client, and calls + c.send(). branch binds c to a Client and again to a Client in a block. Each let of c holds a Client, so each + call runs a method of Client. The call c.with_retry() sits in the value of the second let, where the first + let still binds c. An index that counts a let before its statement ends, or that makes each call after a + second let a record, gives the calls the low name edges of send, and std::fs::create_dir of Other::send reads + found. The calls keep their targets, so std::fs::create_dir is not-found. +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/main.rs//builder + to: src/main.rs//Client//with_retry + kind: member + confidence: high + site: src/main.rs:27 + - from: src/main.rs//builder + to: src/main.rs//Client//send + kind: member + confidence: high + site: src/main.rs:28 + - from: src/main.rs//branch + to: src/main.rs//Client//send + kind: member + confidence: high + site: src/main.rs:35 +no_edges: + - from: src/main.rs//builder + to: src/main.rs//Other//send + - from: src/main.rs//branch + to: src/main.rs//Other//send +unresolved: [] +results: + - target: std//fs//create_dir + status: not-found + call_sites: + - caller: src/main.rs//Other//send + site: src/main.rs:21 + reached: false diff --git a/test/projectgraph/cases/rust/let-same-type/project/Cargo.toml b/test/projectgraph/cases/rust/let-same-type/project/Cargo.toml new file mode 100644 index 00000000..0d44349a --- /dev/null +++ b/test/projectgraph/cases/rust/let-same-type/project/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/let-same-type/project/src/main.rs b/test/projectgraph/cases/rust/let-same-type/project/src/main.rs new file mode 100644 index 00000000..964e1dbc --- /dev/null +++ b/test/projectgraph/cases/rust/let-same-type/project/src/main.rs @@ -0,0 +1,43 @@ +struct Client; + +impl Client { + fn new() -> Client { + Client + } + + fn with_retry(self) -> Client { + self + } + + fn send(&self) { + let _ = std::fs::write("a", "b"); + } +} + +struct Other; + +impl Other { + fn send(&self) { + let _ = std::fs::create_dir("c"); + } +} + +fn builder() { + let c = Client::new(); + let c = c.with_retry(); + c.send(); +} + +fn branch(flag: bool) { + let c = Client::new(); + if flag { + let c = Client; + c.send(); + } + let _ = c; +} + +fn main() { + builder(); + branch(true); +} diff --git a/test/projectgraph/cases/rust/library-build-script/summaries/cargo_kit_1.0.0.json b/test/projectgraph/cases/rust/library-build-script/summaries/cargo_kit_1.0.0.json index 892b7283..3404902f 100644 --- a/test/projectgraph/cases/rust/library-build-script/summaries/cargo_kit_1.0.0.json +++ b/test/projectgraph/cases/rust/library-build-script/summaries/cargo_kit_1.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "cargo:kit@1.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/rust/macro-dependency-function-name/expect.yaml b/test/projectgraph/cases/rust/macro-dependency-function-name/expect.yaml new file mode 100644 index 00000000..0c8d95c7 --- /dev/null +++ b/test/projectgraph/cases/rust/macro-dependency-function-name/expect.yaml @@ -0,0 +1,51 @@ +source: safedep:hand +description: >- + main.rs has #[macro_use] extern crate dep, and dep exports the macro log with #[macro_export]. src/job.rs calls + log!(), which runs that macro and so dep::sink. src/util.rs defines a function log and the struct Store a + method log. A macro call reads macros only, so neither shadows the macro of dep. A link step that takes any + definition of the name for a macro of the crate gives the call no edge, and dep//sink reads uncertain. +units: + vendor/dep: cargo:dep@1.0.0 +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/job.rs//go + to: dep//log + kind: direct + confidence: high + site: src/job.rs:2 +unresolved: + - caller: src/job.rs//go + site: src/job.rs:2 + reason: unknown-receiver + method: log +results: + - target: dep//sink + status: found + path: + - key: src/main.rs//main + - key: src/job.rs//go + site: src/main.rs:8 + kind: direct + confidence: high + - key: dep//log + site: src/job.rs:2 + kind: direct + confidence: high + - key: cargo:dep@1.0.0//src/lib.rs//log + site: cargo:dep@1.0.0//src/lib.rs:2 + kind: package + confidence: high + - key: cargo:dep@1.0.0//src/lib.rs//sink + site: cargo:dep@1.0.0//src/lib.rs:4 + kind: direct + confidence: high + call_sites: + - caller: cargo:dep@1.0.0//src/lib.rs//log + site: cargo:dep@1.0.0//src/lib.rs:4 + reached: true diff --git a/test/projectgraph/cases/rust/macro-dependency-function-name/project/Cargo.toml b/test/projectgraph/cases/rust/macro-dependency-function-name/project/Cargo.toml new file mode 100644 index 00000000..c76f4fc8 --- /dev/null +++ b/test/projectgraph/cases/rust/macro-dependency-function-name/project/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2018" + +[dependencies] +dep = "1.0.0" diff --git a/test/projectgraph/cases/rust/macro-dependency-function-name/project/src/job.rs b/test/projectgraph/cases/rust/macro-dependency-function-name/project/src/job.rs new file mode 100644 index 00000000..1b8fe745 --- /dev/null +++ b/test/projectgraph/cases/rust/macro-dependency-function-name/project/src/job.rs @@ -0,0 +1,3 @@ +pub fn go() { + log!(); +} diff --git a/test/projectgraph/cases/rust/macro-dependency-function-name/project/src/main.rs b/test/projectgraph/cases/rust/macro-dependency-function-name/project/src/main.rs new file mode 100644 index 00000000..90a688ea --- /dev/null +++ b/test/projectgraph/cases/rust/macro-dependency-function-name/project/src/main.rs @@ -0,0 +1,9 @@ +#[macro_use] +extern crate dep; +mod job; +mod util; + +fn main() { + util::log(1); + job::go(); +} diff --git a/test/projectgraph/cases/rust/macro-dependency-function-name/project/src/util.rs b/test/projectgraph/cases/rust/macro-dependency-function-name/project/src/util.rs new file mode 100644 index 00000000..3fbf3f5e --- /dev/null +++ b/test/projectgraph/cases/rust/macro-dependency-function-name/project/src/util.rs @@ -0,0 +1,9 @@ +pub fn log(n: u8) { + let _ = n; +} + +pub struct Store; + +impl Store { + pub fn log(&self) {} +} diff --git a/test/projectgraph/cases/rust/macro-dependency-function-name/project/vendor/dep/Cargo.toml b/test/projectgraph/cases/rust/macro-dependency-function-name/project/vendor/dep/Cargo.toml new file mode 100644 index 00000000..fb6107f0 --- /dev/null +++ b/test/projectgraph/cases/rust/macro-dependency-function-name/project/vendor/dep/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "dep" +version = "1.0.0" +edition = "2018" diff --git a/test/projectgraph/cases/rust/macro-dependency-function-name/project/vendor/dep/src/lib.rs b/test/projectgraph/cases/rust/macro-dependency-function-name/project/vendor/dep/src/lib.rs new file mode 100644 index 00000000..bb64c2eb --- /dev/null +++ b/test/projectgraph/cases/rust/macro-dependency-function-name/project/vendor/dep/src/lib.rs @@ -0,0 +1,10 @@ +#[macro_export] +macro_rules! log { + () => { + $crate::sink() + }; +} + +pub fn sink() { + let _ = std::fs::remove_file("a"); +} diff --git a/test/projectgraph/cases/rust/macro-dependency-function-name/summaries/cargo_dep_1.0.0.json b/test/projectgraph/cases/rust/macro-dependency-function-name/summaries/cargo_dep_1.0.0.json new file mode 100644 index 00000000..2885322b --- /dev/null +++ b/test/projectgraph/cases/rust/macro-dependency-function-name/summaries/cargo_dep_1.0.0.json @@ -0,0 +1,16 @@ +{ + "version": "3", + "index_version": "17", + "link_version": "20", + "unit": "cargo:dep@1.0.0", + "symbols": [ + { + "key": "dep//sink", + "definitions": [ + "cargo:dep@1.0.0//src/lib.rs//sink" + ], + "reaches": [] + } + ], + "targets": [] +} diff --git a/test/projectgraph/cases/rust/macro-export-module/expect.yaml b/test/projectgraph/cases/rust/macro-export-module/expect.yaml new file mode 100644 index 00000000..44e300b0 --- /dev/null +++ b/test/projectgraph/cases/rust/macro-export-module/expect.yaml @@ -0,0 +1,57 @@ +source: safedep:hand +description: >- + The crate dep, the unit cargo:dep@1.2.0, defines the macro wipe in its private module macros with + #[macro_export], which puts the macro at the root of the crate. Its rule calls $crate::sink, the function sink + of the root of dep. main.rs has use dep::wipe and calls wipe!(). A link step that looks for wipe in the root + module of dep finds no definition and records the unit, so every target of dep reads uncertain. A macro that + reads $crate::sink as the name sink records the call too. +units: + vendor/dep: cargo:dep@1.2.0 +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +exact_edges: true +edges: + - from: src/main.rs//main + to: dep//wipe + kind: direct + confidence: high + site: src/main.rs:4 + - from: dep//wipe + to: cargo:dep@1.2.0//src/macros.rs//wipe + kind: package + confidence: high + site: cargo:dep@1.2.0//src/macros.rs:2 + - from: cargo:dep@1.2.0//src/macros.rs//wipe + to: cargo:dep@1.2.0//src/lib.rs//sink + kind: direct + confidence: high + site: cargo:dep@1.2.0//src/macros.rs:4 +unresolved: [] +results: + - target: dep//sink + status: found + path: + - key: src/main.rs//main + - key: dep//wipe + site: src/main.rs:4 + kind: direct + confidence: high + - key: cargo:dep@1.2.0//src/macros.rs//wipe + site: cargo:dep@1.2.0//src/macros.rs:2 + kind: package + confidence: high + - key: cargo:dep@1.2.0//src/lib.rs//sink + site: cargo:dep@1.2.0//src/macros.rs:4 + kind: direct + confidence: high + call_sites: + - caller: cargo:dep@1.2.0//src/macros.rs//wipe + site: cargo:dep@1.2.0//src/macros.rs:4 + reached: true + - target: dep//unused + status: not-found diff --git a/test/projectgraph/cases/rust/macro-export-module/project/Cargo.toml b/test/projectgraph/cases/rust/macro-export-module/project/Cargo.toml new file mode 100644 index 00000000..56e246be --- /dev/null +++ b/test/projectgraph/cases/rust/macro-export-module/project/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" + +[dependencies] +dep = "1.2.0" diff --git a/test/projectgraph/cases/rust/macro-export-module/project/src/main.rs b/test/projectgraph/cases/rust/macro-export-module/project/src/main.rs new file mode 100644 index 00000000..b54e6f1e --- /dev/null +++ b/test/projectgraph/cases/rust/macro-export-module/project/src/main.rs @@ -0,0 +1,5 @@ +use dep::wipe; + +fn main() { + wipe!(); +} diff --git a/test/projectgraph/cases/rust/macro-export-module/project/vendor/dep/Cargo.toml b/test/projectgraph/cases/rust/macro-export-module/project/vendor/dep/Cargo.toml new file mode 100644 index 00000000..5352efc0 --- /dev/null +++ b/test/projectgraph/cases/rust/macro-export-module/project/vendor/dep/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "dep" +version = "1.2.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/macro-export-module/project/vendor/dep/src/lib.rs b/test/projectgraph/cases/rust/macro-export-module/project/vendor/dep/src/lib.rs new file mode 100644 index 00000000..25c954c1 --- /dev/null +++ b/test/projectgraph/cases/rust/macro-export-module/project/vendor/dep/src/lib.rs @@ -0,0 +1,5 @@ +mod macros; + +pub fn sink() {} + +pub fn unused() {} diff --git a/test/projectgraph/cases/rust/macro-export-module/project/vendor/dep/src/macros.rs b/test/projectgraph/cases/rust/macro-export-module/project/vendor/dep/src/macros.rs new file mode 100644 index 00000000..1e08caab --- /dev/null +++ b/test/projectgraph/cases/rust/macro-export-module/project/vendor/dep/src/macros.rs @@ -0,0 +1,6 @@ +#[macro_export] +macro_rules! wipe { + () => { + $crate::sink() + }; +} diff --git a/test/projectgraph/cases/rust/macro-export-module/summaries/cargo_dep_1.2.0.json b/test/projectgraph/cases/rust/macro-export-module/summaries/cargo_dep_1.2.0.json new file mode 100644 index 00000000..22af2b66 --- /dev/null +++ b/test/projectgraph/cases/rust/macro-export-module/summaries/cargo_dep_1.2.0.json @@ -0,0 +1,23 @@ +{ + "version": "3", + "index_version": "17", + "link_version": "20", + "unit": "cargo:dep@1.2.0", + "symbols": [ + { + "key": "dep//sink", + "definitions": [ + "cargo:dep@1.2.0//src/lib.rs//sink" + ], + "reaches": [] + }, + { + "key": "dep//unused", + "definitions": [ + "cargo:dep@1.2.0//src/lib.rs//unused" + ], + "reaches": [] + } + ], + "targets": [] +} diff --git a/test/projectgraph/cases/rust/macro-import/expect.yaml b/test/projectgraph/cases/rust/macro-import/expect.yaml index 97d9d859..85508a25 100644 --- a/test/projectgraph/cases/rust/macro-import/expect.yaml +++ b/test/projectgraph/cases/rust/macro-import/expect.yaml @@ -2,8 +2,9 @@ source: safedep:hand description: >- The case of the vet reach corpus rust/macro-import. main uses the macro render_now of the crate dep, which #[macro_use] extern crate dep brings in. The macro expands to a call of dep::render. The code of the crate dep is - the unit cargo:dep@1.2.0. The link step does not resolve a macro that #[macro_export] gives at the root of a crate - of a unit, so the call of render_now stays a record. The record makes render uncertain, and not not-found. + the unit cargo:dep@1.2.0, and #[macro_export] gives render_now at the root of the crate. So the call of + render_now gets the edge to dep//render_now, whose package edge leads to the macro and on to render. The index + does not tell a call of a macro from a call of a function value, so the call keeps its record too. units: vendor/dep: cargo:dep@1.2.0 roots: @@ -15,6 +16,16 @@ roots: rule: rust.main exact_edges: true edges: + - from: src/main.rs//main + to: dep//render_now + kind: direct + confidence: high + site: src/main.rs:5 + - from: dep//render_now + to: cargo:dep@1.2.0//src/lib.rs//render_now + kind: package + confidence: high + site: cargo:dep@1.2.0//src/lib.rs:4 - from: cargo:dep@1.2.0//src/lib.rs//render_now to: cargo:dep@1.2.0//src/lib.rs//render kind: direct @@ -27,11 +38,22 @@ unresolved: method: render_now results: - target: dep//render - status: uncertain + status: found + path: + - key: src/main.rs//main + - key: dep//render_now + site: src/main.rs:5 + kind: direct + confidence: high + - key: cargo:dep@1.2.0//src/lib.rs//render_now + site: cargo:dep@1.2.0//src/lib.rs:4 + kind: package + confidence: high + - key: cargo:dep@1.2.0//src/lib.rs//render + site: cargo:dep@1.2.0//src/lib.rs:6 + kind: direct + confidence: high call_sites: - caller: cargo:dep@1.2.0//src/lib.rs//render_now site: cargo:dep@1.2.0//src/lib.rs:6 - reached: false - uncertainties: - - kind: unresolved-call - site: src/main.rs:5 + reached: true diff --git a/test/projectgraph/cases/rust/macro-import/summaries/cargo_dep_1.2.0.json b/test/projectgraph/cases/rust/macro-import/summaries/cargo_dep_1.2.0.json index 58d56bc3..b76022eb 100644 --- a/test/projectgraph/cases/rust/macro-import/summaries/cargo_dep_1.2.0.json +++ b/test/projectgraph/cases/rust/macro-import/summaries/cargo_dep_1.2.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "cargo:dep@1.2.0", "symbols": [ { diff --git a/test/projectgraph/cases/rust/macro-local-shadows-dependency/expect.yaml b/test/projectgraph/cases/rust/macro-local-shadows-dependency/expect.yaml new file mode 100644 index 00000000..d6172ab1 --- /dev/null +++ b/test/projectgraph/cases/rust/macro-local-shadows-dependency/expect.yaml @@ -0,0 +1,40 @@ +source: safedep:hand +description: >- + main.rs has #[macro_use] extern crate dep and #[macro_use] mod macros. The crate dep exports a macro log with + #[macro_export], and src/macros.rs defines its own macro_rules! log, which comes later in the text and so + shadows the macro of dep. log!() in src/job.rs runs the local macro, which calls crate::flush. A link step + that gives the call the edge to the macro of dep reads dep//sink as found. The call keeps its record alone, so + dep//sink reads uncertain. +units: + vendor/dep: cargo:dep@1.0.0 +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/job.rs//go + to: src/macros.rs//log + kind: name + confidence: low + site: src/job.rs:2 +no_edges: + - from: src/job.rs//go + to: dep//log +unresolved: + - caller: src/job.rs//go + site: src/job.rs:2 + reason: unknown-receiver + method: log +results: + - target: dep//sink + status: uncertain + call_sites: + - caller: cargo:dep@1.0.0//src/lib.rs//log + site: cargo:dep@1.0.0//src/lib.rs:4 + reached: false + uncertainties: + - kind: unresolved-call + site: src/job.rs:2 diff --git a/test/projectgraph/cases/rust/macro-local-shadows-dependency/project/Cargo.toml b/test/projectgraph/cases/rust/macro-local-shadows-dependency/project/Cargo.toml new file mode 100644 index 00000000..c76f4fc8 --- /dev/null +++ b/test/projectgraph/cases/rust/macro-local-shadows-dependency/project/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2018" + +[dependencies] +dep = "1.0.0" diff --git a/test/projectgraph/cases/rust/macro-local-shadows-dependency/project/src/job.rs b/test/projectgraph/cases/rust/macro-local-shadows-dependency/project/src/job.rs new file mode 100644 index 00000000..1b8fe745 --- /dev/null +++ b/test/projectgraph/cases/rust/macro-local-shadows-dependency/project/src/job.rs @@ -0,0 +1,3 @@ +pub fn go() { + log!(); +} diff --git a/test/projectgraph/cases/rust/macro-local-shadows-dependency/project/src/macros.rs b/test/projectgraph/cases/rust/macro-local-shadows-dependency/project/src/macros.rs new file mode 100644 index 00000000..374dbd39 --- /dev/null +++ b/test/projectgraph/cases/rust/macro-local-shadows-dependency/project/src/macros.rs @@ -0,0 +1,5 @@ +macro_rules! log { + () => { + $crate::flush() + }; +} diff --git a/test/projectgraph/cases/rust/macro-local-shadows-dependency/project/src/main.rs b/test/projectgraph/cases/rust/macro-local-shadows-dependency/project/src/main.rs new file mode 100644 index 00000000..54d47873 --- /dev/null +++ b/test/projectgraph/cases/rust/macro-local-shadows-dependency/project/src/main.rs @@ -0,0 +1,13 @@ +#[macro_use] +extern crate dep; +#[macro_use] +mod macros; +mod job; + +fn main() { + job::go(); +} + +pub fn flush() { + let _ = std::fs::remove_dir("a"); +} diff --git a/test/projectgraph/cases/rust/macro-local-shadows-dependency/project/vendor/dep/Cargo.toml b/test/projectgraph/cases/rust/macro-local-shadows-dependency/project/vendor/dep/Cargo.toml new file mode 100644 index 00000000..fb6107f0 --- /dev/null +++ b/test/projectgraph/cases/rust/macro-local-shadows-dependency/project/vendor/dep/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "dep" +version = "1.0.0" +edition = "2018" diff --git a/test/projectgraph/cases/rust/macro-local-shadows-dependency/project/vendor/dep/src/lib.rs b/test/projectgraph/cases/rust/macro-local-shadows-dependency/project/vendor/dep/src/lib.rs new file mode 100644 index 00000000..bb64c2eb --- /dev/null +++ b/test/projectgraph/cases/rust/macro-local-shadows-dependency/project/vendor/dep/src/lib.rs @@ -0,0 +1,10 @@ +#[macro_export] +macro_rules! log { + () => { + $crate::sink() + }; +} + +pub fn sink() { + let _ = std::fs::remove_file("a"); +} diff --git a/test/projectgraph/cases/rust/macro-local-shadows-dependency/summaries/cargo_dep_1.0.0.json b/test/projectgraph/cases/rust/macro-local-shadows-dependency/summaries/cargo_dep_1.0.0.json new file mode 100644 index 00000000..2885322b --- /dev/null +++ b/test/projectgraph/cases/rust/macro-local-shadows-dependency/summaries/cargo_dep_1.0.0.json @@ -0,0 +1,16 @@ +{ + "version": "3", + "index_version": "17", + "link_version": "20", + "unit": "cargo:dep@1.0.0", + "symbols": [ + { + "key": "dep//sink", + "definitions": [ + "cargo:dep@1.0.0//src/lib.rs//sink" + ], + "reaches": [] + } + ], + "targets": [] +} diff --git a/test/projectgraph/cases/rust/macro-metavariable-call/expect.yaml b/test/projectgraph/cases/rust/macro-metavariable-call/expect.yaml new file mode 100644 index 00000000..601e4fcd --- /dev/null +++ b/test/projectgraph/cases/rust/macro-metavariable-call/expect.yaml @@ -0,0 +1,33 @@ +source: safedep:hand +description: >- + The rule of the macro call has $f(), which calls the function that a call of the macro passes. main calls + call!(target), so target runs and calls std::fs::remove_dir. The tokens of the rule do not name the function, + and a macro that reads $f() as no call gives no edge and no record, so std::fs::remove_dir reads not-found. + The call is a record with the reason computed-name, so the target reads uncertain. +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/main.rs//main + to: src/main.rs//call + kind: direct + confidence: high + site: src/main.rs:12 +unresolved: + - caller: src/main.rs//call + site: src/main.rs:3 + reason: computed-name +results: + - target: std//fs//remove_dir + status: uncertain + call_sites: + - caller: src/main.rs//target + site: src/main.rs:8 + reached: false + uncertainties: + - kind: unresolved-call + site: src/main.rs:3 diff --git a/test/projectgraph/cases/rust/macro-metavariable-call/project/Cargo.toml b/test/projectgraph/cases/rust/macro-metavariable-call/project/Cargo.toml new file mode 100644 index 00000000..0d44349a --- /dev/null +++ b/test/projectgraph/cases/rust/macro-metavariable-call/project/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/macro-metavariable-call/project/src/main.rs b/test/projectgraph/cases/rust/macro-metavariable-call/project/src/main.rs new file mode 100644 index 00000000..85ffcc10 --- /dev/null +++ b/test/projectgraph/cases/rust/macro-metavariable-call/project/src/main.rs @@ -0,0 +1,13 @@ +macro_rules! call { + ($f:ident) => { + $f() + }; +} + +fn target() { + let _ = std::fs::remove_dir("a"); +} + +fn main() { + call!(target); +} diff --git a/test/projectgraph/cases/rust/macro-std-name/expect.yaml b/test/projectgraph/cases/rust/macro-std-name/expect.yaml new file mode 100644 index 00000000..5e198bb9 --- /dev/null +++ b/test/projectgraph/cases/rust/macro-std-name/expect.yaml @@ -0,0 +1,47 @@ +source: safedep:hand +description: >- + The file defines its own macro_rules! vec, whose rule binds the name that its call passes to a Cloud. go + binds t to a Disk, calls vec!(t), and calls t.save(), which runs Cloud::save. Cloud::save calls + std::fs::remove_dir_all. A macro of std binds no name of its caller, but this vec is no macro of std. An + index that takes vec! for the macro of std keeps the call graph target Disk::save with no record, and + std::fs::remove_dir_all reads not-found. The index makes the call a record with the reason + unknown-receiver, so it gets the low name edges of save. +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/main.rs//go + to: src/main.rs//Cloud//save + kind: name + confidence: low + site: src/main.rs:25 +unresolved: + - caller: src/main.rs//go + site: src/main.rs:25 + reason: unknown-receiver + method: save +results: + - target: std//fs//remove_dir_all + status: found + path: + - key: src/main.rs//main + - key: src/main.rs//go + site: src/main.rs:29 + kind: direct + confidence: high + - key: src/main.rs//Cloud//save + site: src/main.rs:25 + kind: name + confidence: low + - key: std//fs//remove_dir_all + site: src/main.rs:12 + kind: direct + confidence: high + call_sites: + - caller: src/main.rs//Cloud//save + site: src/main.rs:12 + reached: true diff --git a/test/projectgraph/cases/rust/macro-std-name/project/Cargo.toml b/test/projectgraph/cases/rust/macro-std-name/project/Cargo.toml new file mode 100644 index 00000000..0d44349a --- /dev/null +++ b/test/projectgraph/cases/rust/macro-std-name/project/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/macro-std-name/project/src/main.rs b/test/projectgraph/cases/rust/macro-std-name/project/src/main.rs new file mode 100644 index 00000000..fe2c6971 --- /dev/null +++ b/test/projectgraph/cases/rust/macro-std-name/project/src/main.rs @@ -0,0 +1,30 @@ +pub struct Disk; +pub struct Cloud; + +impl Disk { + pub fn save(&self) { + let _ = std::fs::write("disk", "x"); + } +} + +impl Cloud { + pub fn save(&self) { + let _ = std::fs::remove_dir_all("cloud"); + } +} + +macro_rules! vec { + ($n:ident) => { + let $n = Cloud; + }; +} + +fn go() { + let t = Disk; + vec!(t); + t.save(); +} + +fn main() { + go(); +} diff --git a/test/projectgraph/cases/rust/reexport-third-crate/expect.yaml b/test/projectgraph/cases/rust/reexport-third-crate/expect.yaml new file mode 100644 index 00000000..43261b79 --- /dev/null +++ b/test/projectgraph/cases/rust/reexport-third-crate/expect.yaml @@ -0,0 +1,114 @@ +source: safedep:hand +description: >- + main calls dep1::bound::save and dep1::glob::load. The unit cargo:dep1@1.0.0 has pub use dep2::store::save + in bound and pub use dep2::store::* in glob, and the unit cargo:dep2@1.0.0 defines save and load in store. + bound also defines audit, so the summary of dep1 has a symbol. The walk of each key of dep1 ends on the key + of dep2, which no call names, so it has no node. A link step that links only to a node gives the keys of + dep1 no edge and no record, and std::fs::remove_file and std::fs::remove_dir read not-found. +units: + vendor/dep1: cargo:dep1@1.0.0 + vendor/dep2: cargo:dep2@1.0.0 +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +exact_edges: true +edges: + - from: src/main.rs//main + to: dep1//bound//save + kind: direct + confidence: high + site: src/main.rs:2 + - from: src/main.rs//main + to: dep1//glob//load + kind: direct + confidence: high + site: src/main.rs:3 + - from: dep1//bound//save + to: dep2//store//save + kind: package + confidence: high + site: cargo:dep1@1.0.0 + - from: dep1//glob//load + to: dep2//store//load + kind: package + confidence: high + site: cargo:dep1@1.0.0 + - from: dep2//store//save + to: cargo:dep2@1.0.0//src/store.rs//save + kind: package + confidence: high + site: cargo:dep2@1.0.0//src/store.rs:1 + - from: dep2//store//load + to: cargo:dep2@1.0.0//src/store.rs//load + kind: package + confidence: high + site: cargo:dep2@1.0.0//src/store.rs:5 + - from: cargo:dep2@1.0.0//src/store.rs//save + to: std//fs//remove_file + kind: direct + confidence: high + site: cargo:dep2@1.0.0//src/store.rs:2 + - from: cargo:dep2@1.0.0//src/store.rs//load + to: std//fs//remove_dir + kind: direct + confidence: high + site: cargo:dep2@1.0.0//src/store.rs:6 + - from: cargo:dep1@1.0.0//src/bound.rs//audit + to: std//fs//read + kind: direct + confidence: high + site: cargo:dep1@1.0.0//src/bound.rs:4 +unresolved: [] +results: + - target: std//fs//remove_file + status: found + path: + - key: src/main.rs//main + - key: dep1//bound//save + site: src/main.rs:2 + kind: direct + confidence: high + - key: dep2//store//save + site: cargo:dep1@1.0.0 + kind: package + confidence: high + - key: cargo:dep2@1.0.0//src/store.rs//save + site: cargo:dep2@1.0.0//src/store.rs:1 + kind: package + confidence: high + - key: std//fs//remove_file + site: cargo:dep2@1.0.0//src/store.rs:2 + kind: direct + confidence: high + call_sites: + - caller: cargo:dep2@1.0.0//src/store.rs//save + site: cargo:dep2@1.0.0//src/store.rs:2 + reached: true + - target: std//fs//remove_dir + status: found + path: + - key: src/main.rs//main + - key: dep1//glob//load + site: src/main.rs:3 + kind: direct + confidence: high + - key: dep2//store//load + site: cargo:dep1@1.0.0 + kind: package + confidence: high + - key: cargo:dep2@1.0.0//src/store.rs//load + site: cargo:dep2@1.0.0//src/store.rs:5 + kind: package + confidence: high + - key: std//fs//remove_dir + site: cargo:dep2@1.0.0//src/store.rs:6 + kind: direct + confidence: high + call_sites: + - caller: cargo:dep2@1.0.0//src/store.rs//load + site: cargo:dep2@1.0.0//src/store.rs:6 + reached: true diff --git a/test/projectgraph/cases/rust/reexport-third-crate/project/Cargo.toml b/test/projectgraph/cases/rust/reexport-third-crate/project/Cargo.toml new file mode 100644 index 00000000..d90723b1 --- /dev/null +++ b/test/projectgraph/cases/rust/reexport-third-crate/project/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" + +[dependencies] +dep1 = "1.0.0" diff --git a/test/projectgraph/cases/rust/reexport-third-crate/project/src/main.rs b/test/projectgraph/cases/rust/reexport-third-crate/project/src/main.rs new file mode 100644 index 00000000..c4bf9661 --- /dev/null +++ b/test/projectgraph/cases/rust/reexport-third-crate/project/src/main.rs @@ -0,0 +1,4 @@ +fn main() { + dep1::bound::save(); + dep1::glob::load(); +} diff --git a/test/projectgraph/cases/rust/reexport-third-crate/project/vendor/dep1/Cargo.toml b/test/projectgraph/cases/rust/reexport-third-crate/project/vendor/dep1/Cargo.toml new file mode 100644 index 00000000..053e0a3c --- /dev/null +++ b/test/projectgraph/cases/rust/reexport-third-crate/project/vendor/dep1/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "dep1" +version = "1.0.0" +edition = "2021" + +[dependencies] +dep2 = "1.0.0" diff --git a/test/projectgraph/cases/rust/reexport-third-crate/project/vendor/dep1/src/bound.rs b/test/projectgraph/cases/rust/reexport-third-crate/project/vendor/dep1/src/bound.rs new file mode 100644 index 00000000..9cc08fe8 --- /dev/null +++ b/test/projectgraph/cases/rust/reexport-third-crate/project/vendor/dep1/src/bound.rs @@ -0,0 +1,5 @@ +pub use dep2::store::save; + +pub fn audit() { + let _ = std::fs::read("audit"); +} diff --git a/test/projectgraph/cases/rust/reexport-third-crate/project/vendor/dep1/src/glob.rs b/test/projectgraph/cases/rust/reexport-third-crate/project/vendor/dep1/src/glob.rs new file mode 100644 index 00000000..80ce2c21 --- /dev/null +++ b/test/projectgraph/cases/rust/reexport-third-crate/project/vendor/dep1/src/glob.rs @@ -0,0 +1 @@ +pub use dep2::store::*; diff --git a/test/projectgraph/cases/rust/reexport-third-crate/project/vendor/dep1/src/lib.rs b/test/projectgraph/cases/rust/reexport-third-crate/project/vendor/dep1/src/lib.rs new file mode 100644 index 00000000..c1d93582 --- /dev/null +++ b/test/projectgraph/cases/rust/reexport-third-crate/project/vendor/dep1/src/lib.rs @@ -0,0 +1,2 @@ +pub mod bound; +pub mod glob; diff --git a/test/projectgraph/cases/rust/reexport-third-crate/project/vendor/dep2/Cargo.toml b/test/projectgraph/cases/rust/reexport-third-crate/project/vendor/dep2/Cargo.toml new file mode 100644 index 00000000..f2e71301 --- /dev/null +++ b/test/projectgraph/cases/rust/reexport-third-crate/project/vendor/dep2/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "dep2" +version = "1.0.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/reexport-third-crate/project/vendor/dep2/src/lib.rs b/test/projectgraph/cases/rust/reexport-third-crate/project/vendor/dep2/src/lib.rs new file mode 100644 index 00000000..55c88cbf --- /dev/null +++ b/test/projectgraph/cases/rust/reexport-third-crate/project/vendor/dep2/src/lib.rs @@ -0,0 +1 @@ +pub mod store; diff --git a/test/projectgraph/cases/rust/reexport-third-crate/project/vendor/dep2/src/store.rs b/test/projectgraph/cases/rust/reexport-third-crate/project/vendor/dep2/src/store.rs new file mode 100644 index 00000000..8672c123 --- /dev/null +++ b/test/projectgraph/cases/rust/reexport-third-crate/project/vendor/dep2/src/store.rs @@ -0,0 +1,7 @@ +pub fn save() { + let _ = std::fs::remove_file("save"); +} + +pub fn load() { + let _ = std::fs::remove_dir("load"); +} diff --git a/test/projectgraph/cases/rust/reexport-third-crate/summaries/cargo_dep1_1.0.0.json b/test/projectgraph/cases/rust/reexport-third-crate/summaries/cargo_dep1_1.0.0.json new file mode 100644 index 00000000..dcff5789 --- /dev/null +++ b/test/projectgraph/cases/rust/reexport-third-crate/summaries/cargo_dep1_1.0.0.json @@ -0,0 +1,16 @@ +{ + "version": "3", + "index_version": "17", + "link_version": "20", + "unit": "cargo:dep1@1.0.0", + "symbols": [ + { + "key": "dep1//bound//audit", + "definitions": [ + "cargo:dep1@1.0.0//src/bound.rs//audit" + ], + "reaches": [] + } + ], + "targets": [] +} diff --git a/test/projectgraph/cases/rust/reexport-third-crate/summaries/cargo_dep2_1.0.0.json b/test/projectgraph/cases/rust/reexport-third-crate/summaries/cargo_dep2_1.0.0.json new file mode 100644 index 00000000..45616ab4 --- /dev/null +++ b/test/projectgraph/cases/rust/reexport-third-crate/summaries/cargo_dep2_1.0.0.json @@ -0,0 +1,23 @@ +{ + "version": "3", + "index_version": "17", + "link_version": "20", + "unit": "cargo:dep2@1.0.0", + "symbols": [ + { + "key": "dep2//store//load", + "definitions": [ + "cargo:dep2@1.0.0//src/store.rs//load" + ], + "reaches": [] + }, + { + "key": "dep2//store//save", + "definitions": [ + "cargo:dep2@1.0.0//src/store.rs//save" + ], + "reaches": [] + } + ], + "targets": [] +} diff --git a/test/projectgraph/cases/rust/shadowed-let-type/expect.yaml b/test/projectgraph/cases/rust/shadowed-let-type/expect.yaml new file mode 100644 index 00000000..dfbfa782 --- /dev/null +++ b/test/projectgraph/cases/rust/shadowed-let-type/expect.yaml @@ -0,0 +1,72 @@ +source: safedep:hand +description: >- + go binds t with a let to a Disk and calls t.save(), then binds t again with a second let to a Cloud and + calls t.save() again. The second call runs Cloud::save, which calls std::fs::remove_dir_all. The call graph + binds a name to the value of its first let, so it sends both calls to Disk::save. Without the rule, the + second call gets no record and no edge to Cloud::save, and std::fs::remove_dir_all reads not-found. The + index keeps the first call and makes the second one a record with the reason unknown-receiver, so the second + call gets the low name edges of save. +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/main.rs//go + to: src/main.rs//Disk//save + kind: member + confidence: high + site: src/main.rs:18 + - from: src/main.rs//go + to: src/main.rs//Cloud//save + kind: name + confidence: low + site: src/main.rs:20 +unresolved: + - caller: src/main.rs//go + site: src/main.rs:20 + reason: unknown-receiver + method: save +results: + - target: std//fs//write + status: found + path: + - key: src/main.rs//main + - key: src/main.rs//go + site: src/main.rs:24 + kind: direct + confidence: high + - key: src/main.rs//Disk//save + site: src/main.rs:18 + kind: member + confidence: high + - key: std//fs//write + site: src/main.rs:6 + kind: direct + confidence: high + call_sites: + - caller: src/main.rs//Disk//save + site: src/main.rs:6 + reached: true + - target: std//fs//remove_dir_all + status: found + path: + - key: src/main.rs//main + - key: src/main.rs//go + site: src/main.rs:24 + kind: direct + confidence: high + - key: src/main.rs//Cloud//save + site: src/main.rs:20 + kind: name + confidence: low + - key: std//fs//remove_dir_all + site: src/main.rs:12 + kind: direct + confidence: high + call_sites: + - caller: src/main.rs//Cloud//save + site: src/main.rs:12 + reached: true diff --git a/test/projectgraph/cases/rust/shadowed-let-type/project/Cargo.toml b/test/projectgraph/cases/rust/shadowed-let-type/project/Cargo.toml new file mode 100644 index 00000000..0d44349a --- /dev/null +++ b/test/projectgraph/cases/rust/shadowed-let-type/project/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/shadowed-let-type/project/src/main.rs b/test/projectgraph/cases/rust/shadowed-let-type/project/src/main.rs new file mode 100644 index 00000000..fc5eaeb8 --- /dev/null +++ b/test/projectgraph/cases/rust/shadowed-let-type/project/src/main.rs @@ -0,0 +1,25 @@ +pub struct Disk; +pub struct Cloud; + +impl Disk { + pub fn save(&self) { + let _ = std::fs::write("disk", "x"); + } +} + +impl Cloud { + pub fn save(&self) { + let _ = std::fs::remove_dir_all("cloud"); + } +} + +fn go() { + let t = Disk; + t.save(); + let t = Cloud; + t.save(); +} + +fn main() { + go(); +} diff --git a/test/projectgraph/cases/rust/super-path-inline-module/expect.yaml b/test/projectgraph/cases/rust/super-path-inline-module/expect.yaml new file mode 100644 index 00000000..4554620b --- /dev/null +++ b/test/projectgraph/cases/rust/super-path-inline-module/expect.yaml @@ -0,0 +1,165 @@ +source: safedep:hand +description: >- + The inline module other of src/store.rs calls super::Item::new and self::inner::run. super of other is the + module store, and self is other. other also makes values of super::Item with super::Item::new, + super::Item {} and crate::store::Item::new, and calls save on each. other defines an Item of its own, whose + save calls std::fs::remove_dir. The call graph reads no inline module, and the link step reads such a path + from the module of the file. So super::Item::new goes to the external key super//Item//new, and + std::fs::write reads not-found. self::inner::run names an inner of the module store, which does not exist. + i.save() and j.save() go to super//Item//save, which gets low name edges to the save of each Item, so + std::fs::remove_dir reads found. +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +exact_edges: true +edges: + - from: src/main.rs//main + to: src/store.rs//other//sib + kind: direct + confidence: high + site: src/main.rs:4 + - from: src/main.rs//main + to: src/store.rs//other//made + kind: direct + confidence: high + site: src/main.rs:5 + - from: src/main.rs//main + to: src/store.rs//other//rooted + kind: direct + confidence: high + site: src/main.rs:6 + - from: src/store.rs//Item//new + to: std//fs//write + kind: direct + confidence: high + site: src/store.rs:5 + - from: src/store.rs//Item//save + to: src/store.rs//Item + kind: direct + confidence: high + site: src/store.rs:9 + - from: src/store.rs//Item//save + to: std//fs//remove_file + kind: direct + confidence: high + site: src/store.rs:10 + - from: src/store.rs//other//Item//save + to: src/store.rs//other//Item + kind: direct + confidence: high + site: src/store.rs:18 + - from: src/store.rs//other//Item//save + to: std//fs//remove_dir + kind: direct + confidence: high + site: src/store.rs:19 + - from: src/store.rs//other//inner//run + to: std//fs//create_dir + kind: direct + confidence: high + site: src/store.rs:41 + - from: src/store.rs//other//sib + to: src/store.rs//Item//new + kind: direct + confidence: high + site: src/store.rs:24 + - from: src/store.rs//other//sib + to: src/store.rs//Item//save + kind: member + confidence: high + site: src/store.rs:25 + - from: src/store.rs//other//sib + to: src/store.rs//other//inner//run + kind: direct + confidence: high + site: src/store.rs:26 + - from: src/store.rs//other//made + to: src/store.rs//Item + kind: direct + confidence: high + site: src/store.rs:30 + - from: src/store.rs//other//made + to: src/store.rs//Item//save + kind: member + confidence: high + site: src/store.rs:31 + - from: src/store.rs//other//rooted + to: src/store.rs//Item//new + kind: direct + confidence: high + site: src/store.rs:35 + - from: src/store.rs//other//rooted + to: src/store.rs//Item//save + kind: member + confidence: high + site: src/store.rs:36 +unresolved: [] +results: + - target: std//fs//write + status: found + path: + - key: src/main.rs//main + - key: src/store.rs//other//sib + site: src/main.rs:4 + kind: direct + confidence: high + - key: src/store.rs//Item//new + site: src/store.rs:24 + kind: direct + confidence: high + - key: std//fs//write + site: src/store.rs:5 + kind: direct + confidence: high + call_sites: + - caller: src/store.rs//Item//new + site: src/store.rs:5 + reached: true + - target: std//fs//remove_file + status: found + sources: [src/store.rs//other//made] + sources_only: true + path: + - key: src/store.rs//other//made + - key: src/store.rs//Item//save + site: src/store.rs:31 + kind: member + confidence: high + - key: std//fs//remove_file + site: src/store.rs:10 + kind: direct + confidence: high + call_sites: + - caller: src/store.rs//Item//save + site: src/store.rs:10 + reached: true + - target: std//fs//remove_dir + status: not-found + call_sites: + - caller: src/store.rs//other//Item//save + site: src/store.rs:19 + reached: false + - target: std//fs//create_dir + status: found + path: + - key: src/main.rs//main + - key: src/store.rs//other//sib + site: src/main.rs:4 + kind: direct + confidence: high + - key: src/store.rs//other//inner//run + site: src/store.rs:26 + kind: direct + confidence: high + - key: std//fs//create_dir + site: src/store.rs:41 + kind: direct + confidence: high + call_sites: + - caller: src/store.rs//other//inner//run + site: src/store.rs:41 + reached: true diff --git a/test/projectgraph/cases/rust/super-path-inline-module/project/Cargo.toml b/test/projectgraph/cases/rust/super-path-inline-module/project/Cargo.toml new file mode 100644 index 00000000..0d44349a --- /dev/null +++ b/test/projectgraph/cases/rust/super-path-inline-module/project/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/super-path-inline-module/project/src/main.rs b/test/projectgraph/cases/rust/super-path-inline-module/project/src/main.rs new file mode 100644 index 00000000..a6e06a13 --- /dev/null +++ b/test/projectgraph/cases/rust/super-path-inline-module/project/src/main.rs @@ -0,0 +1,7 @@ +mod store; + +fn main() { + store::other::sib(); + store::other::made(); + store::other::rooted(); +} diff --git a/test/projectgraph/cases/rust/super-path-inline-module/project/src/store.rs b/test/projectgraph/cases/rust/super-path-inline-module/project/src/store.rs new file mode 100644 index 00000000..58c60fd9 --- /dev/null +++ b/test/projectgraph/cases/rust/super-path-inline-module/project/src/store.rs @@ -0,0 +1,44 @@ +pub struct Item; + +impl Item { + pub fn new() -> Item { + let _ = std::fs::write("top", "x"); + Item + } + + pub fn save(&self) { + let _ = std::fs::remove_file("top"); + } +} + +pub mod other { + pub struct Item; + + impl Item { + pub fn save(&self) { + let _ = std::fs::remove_dir("other"); + } + } + + pub fn sib() { + let i = super::Item::new(); + i.save(); + self::inner::run(); + } + + pub fn made() { + let j = super::Item {}; + j.save(); + } + + pub fn rooted() { + let k = crate::store::Item::new(); + k.save(); + } + + pub mod inner { + pub fn run() { + let _ = std::fs::create_dir("inner"); + } + } +} diff --git a/test/projectgraph/cases/rust/trait-object-shadowed/summaries/cargo_dep_1.2.0.json b/test/projectgraph/cases/rust/trait-object-shadowed/summaries/cargo_dep_1.2.0.json index a0c68e22..80f550ed 100644 --- a/test/projectgraph/cases/rust/trait-object-shadowed/summaries/cargo_dep_1.2.0.json +++ b/test/projectgraph/cases/rust/trait-object-shadowed/summaries/cargo_dep_1.2.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "cargo:dep@1.2.0", "symbols": [ { diff --git a/test/projectgraph/cases/rust/trait-object/summaries/cargo_dep_1.2.0.json b/test/projectgraph/cases/rust/trait-object/summaries/cargo_dep_1.2.0.json index 37ffff09..9512f1ef 100644 --- a/test/projectgraph/cases/rust/trait-object/summaries/cargo_dep_1.2.0.json +++ b/test/projectgraph/cases/rust/trait-object/summaries/cargo_dep_1.2.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "cargo:dep@1.2.0", "symbols": [ { diff --git a/test/projectgraph/cases/rust/use-binding-path/summaries/cargo_dep_1.0.0.json b/test/projectgraph/cases/rust/use-binding-path/summaries/cargo_dep_1.0.0.json index 5bdf2f40..538baa79 100644 --- a/test/projectgraph/cases/rust/use-binding-path/summaries/cargo_dep_1.0.0.json +++ b/test/projectgraph/cases/rust/use-binding-path/summaries/cargo_dep_1.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "cargo:dep@1.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/rust/use-chain-module/expect.yaml b/test/projectgraph/cases/rust/use-chain-module/expect.yaml new file mode 100644 index 00000000..d4fb621d --- /dev/null +++ b/test/projectgraph/cases/rust/use-chain-module/expect.yaml @@ -0,0 +1,53 @@ +source: safedep:hand +description: >- + src/worker.rs has use crate::deep, then use deep::util, then use util::helpers. Each use reads the module + that the use before it binds, so helpers names the module src/deep/util/helpers.rs, and go calls its function + cleanup. cleanup calls std::fs::remove_file, so the target is found. A link step that stops a path on a + module that a use binds does not resolve deep::util. The call of helpers::cleanup then gets the edge to the + key util//helpers//cleanup with no record, and std::fs::remove_file reads not-found. +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +exact_edges: true +edges: + - from: src/main.rs//main + to: src/worker.rs//go + kind: direct + confidence: high + site: src/main.rs:5 + - from: src/worker.rs//go + to: src/deep/util/helpers.rs//cleanup + kind: direct + confidence: high + site: src/worker.rs:6 + - from: src/deep/util/helpers.rs//cleanup + to: std//fs//remove_file + kind: direct + confidence: high + site: src/deep/util/helpers.rs:2 +unresolved: [] +results: + - target: std//fs//remove_file + status: found + path: + - key: src/main.rs//main + - key: src/worker.rs//go + site: src/main.rs:5 + kind: direct + confidence: high + - key: src/deep/util/helpers.rs//cleanup + site: src/worker.rs:6 + kind: direct + confidence: high + - key: std//fs//remove_file + site: src/deep/util/helpers.rs:2 + kind: direct + confidence: high + call_sites: + - caller: src/deep/util/helpers.rs//cleanup + site: src/deep/util/helpers.rs:2 + reached: true diff --git a/test/projectgraph/cases/rust/use-chain-module/project/Cargo.toml b/test/projectgraph/cases/rust/use-chain-module/project/Cargo.toml new file mode 100644 index 00000000..0d44349a --- /dev/null +++ b/test/projectgraph/cases/rust/use-chain-module/project/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/use-chain-module/project/src/deep/mod.rs b/test/projectgraph/cases/rust/use-chain-module/project/src/deep/mod.rs new file mode 100644 index 00000000..812d1edf --- /dev/null +++ b/test/projectgraph/cases/rust/use-chain-module/project/src/deep/mod.rs @@ -0,0 +1 @@ +pub mod util; diff --git a/test/projectgraph/cases/rust/use-chain-module/project/src/deep/util/helpers.rs b/test/projectgraph/cases/rust/use-chain-module/project/src/deep/util/helpers.rs new file mode 100644 index 00000000..af9dfae2 --- /dev/null +++ b/test/projectgraph/cases/rust/use-chain-module/project/src/deep/util/helpers.rs @@ -0,0 +1,3 @@ +pub fn cleanup(p: &str) { + let _ = std::fs::remove_file(p); +} diff --git a/test/projectgraph/cases/rust/use-chain-module/project/src/deep/util/mod.rs b/test/projectgraph/cases/rust/use-chain-module/project/src/deep/util/mod.rs new file mode 100644 index 00000000..1630fabc --- /dev/null +++ b/test/projectgraph/cases/rust/use-chain-module/project/src/deep/util/mod.rs @@ -0,0 +1 @@ +pub mod helpers; diff --git a/test/projectgraph/cases/rust/use-chain-module/project/src/main.rs b/test/projectgraph/cases/rust/use-chain-module/project/src/main.rs new file mode 100644 index 00000000..21d9fc49 --- /dev/null +++ b/test/projectgraph/cases/rust/use-chain-module/project/src/main.rs @@ -0,0 +1,6 @@ +mod deep; +mod worker; + +fn main() { + worker::go(); +} diff --git a/test/projectgraph/cases/rust/use-chain-module/project/src/worker.rs b/test/projectgraph/cases/rust/use-chain-module/project/src/worker.rs new file mode 100644 index 00000000..851a06aa --- /dev/null +++ b/test/projectgraph/cases/rust/use-chain-module/project/src/worker.rs @@ -0,0 +1,7 @@ +use crate::deep; +use deep::util; +use util::helpers; + +pub fn go() { + helpers::cleanup("x"); +} diff --git a/test/projectgraph/cases/rust/use-dependency-item/summaries/cargo_dep_1.0.0.json b/test/projectgraph/cases/rust/use-dependency-item/summaries/cargo_dep_1.0.0.json index ed1c0b55..80465b0d 100644 --- a/test/projectgraph/cases/rust/use-dependency-item/summaries/cargo_dep_1.0.0.json +++ b/test/projectgraph/cases/rust/use-dependency-item/summaries/cargo_dep_1.0.0.json @@ -1,7 +1,7 @@ { "version": "3", - "index_version": "16", - "link_version": "19", + "index_version": "17", + "link_version": "20", "unit": "cargo:dep@1.0.0", "symbols": [ { diff --git a/test/projectgraph/cases/rust/use-self-inline-module/expect.yaml b/test/projectgraph/cases/rust/use-self-inline-module/expect.yaml new file mode 100644 index 00000000..7a72ab60 --- /dev/null +++ b/test/projectgraph/cases/rust/use-self-inline-module/expect.yaml @@ -0,0 +1,51 @@ +source: safedep:hand +description: >- + src/net.rs declares the module tls at its top level and the inline module client, which declares its own + module tls. client has use self::tls::conn, so conn names client::tls::conn, and go calls conn::open, which + calls std::fs::create_dir. The tls of the top level has its own conn::open, which calls std::fs::read and + which nothing calls. A link step that reads self of the inline module as the module of the file gives the call + the edge to the wrong open, so std::fs::create_dir reads not-found and std::fs::read reads found. +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/net.rs//client//go + to: src/net.rs//client//tls//conn//open + kind: member + confidence: high + site: src/net.rs:21 +no_edges: + - from: src/net.rs//client//go + to: src/net.rs//tls//conn//open +unresolved: [] +results: + - target: std//fs//create_dir + status: found + path: + - key: src/main.rs//main + - key: src/net.rs//client//go + site: src/main.rs:4 + kind: direct + confidence: high + - key: src/net.rs//client//tls//conn//open + site: src/net.rs:21 + kind: member + confidence: high + - key: std//fs//create_dir + site: src/net.rs:13 + kind: direct + confidence: high + call_sites: + - caller: src/net.rs//client//tls//conn//open + site: src/net.rs:13 + reached: true + - target: std//fs//read + status: not-found + call_sites: + - caller: src/net.rs//tls//conn//open + site: src/net.rs:4 + reached: false diff --git a/test/projectgraph/cases/rust/use-self-inline-module/project/Cargo.toml b/test/projectgraph/cases/rust/use-self-inline-module/project/Cargo.toml new file mode 100644 index 00000000..0d44349a --- /dev/null +++ b/test/projectgraph/cases/rust/use-self-inline-module/project/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/use-self-inline-module/project/src/main.rs b/test/projectgraph/cases/rust/use-self-inline-module/project/src/main.rs new file mode 100644 index 00000000..12c48ae4 --- /dev/null +++ b/test/projectgraph/cases/rust/use-self-inline-module/project/src/main.rs @@ -0,0 +1,5 @@ +mod net; + +fn main() { + net::client::go(); +} diff --git a/test/projectgraph/cases/rust/use-self-inline-module/project/src/net.rs b/test/projectgraph/cases/rust/use-self-inline-module/project/src/net.rs new file mode 100644 index 00000000..931eb200 --- /dev/null +++ b/test/projectgraph/cases/rust/use-self-inline-module/project/src/net.rs @@ -0,0 +1,23 @@ +pub mod tls { + pub mod conn { + pub fn open() { + let _ = std::fs::read("top"); + } + } +} + +pub mod client { + pub mod tls { + pub mod conn { + pub fn open() { + let _ = std::fs::create_dir("client"); + } + } + } + + use self::tls::conn; + + pub fn go() { + conn::open(); + } +} diff --git a/test/projectgraph/cases/rust/use-shadow-root-type/expect.yaml b/test/projectgraph/cases/rust/use-shadow-root-type/expect.yaml new file mode 100644 index 00000000..f42088d6 --- /dev/null +++ b/test/projectgraph/cases/rust/use-shadow-root-type/expect.yaml @@ -0,0 +1,54 @@ +source: safedep:hand +description: >- + src/main.rs declares a struct A at its root, and src/other.rs declares another A. The inline module deep has + use crate::other::A, and the function by_block has the same use in its block. So the field a of Holder, the + parameter x of by_param, the let x of by_new and the calls in by_block hold the A of src/other.rs, whose run + calls std::fs::remove_file. Nothing calls run of the root A, which calls std::fs::remove_dir. A link step that + reads a use of an inline module or of a block for the root of the file joins the root A with the A of + src/other.rs as one class, so each call goes to the run of the root A, std::fs::remove_file reads not-found + and std::fs::remove_dir reads found. +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +no_edges: + - from: src/main.rs//deep//by_field + to: src/main.rs//A//run + - from: src/main.rs//deep//by_param + to: src/main.rs//A//run + - from: src/main.rs//deep//by_new + to: src/main.rs//A//run + - from: src/main.rs//by_block + to: src/main.rs//A//run +edges: + - from: src/main.rs//deep//by_field + to: src/other.rs//A//run + kind: member + confidence: high + site: src/main.rs:23 + - from: src/main.rs//deep//by_param + to: src/other.rs//A//run + kind: member + confidence: high + site: src/main.rs:27 + - from: src/main.rs//deep//by_new + to: src/other.rs//A//run + kind: member + confidence: high + site: src/main.rs:32 + - from: src/main.rs//by_block + to: src/other.rs//A//run + kind: member + confidence: high + site: src/main.rs:38 +unresolved: [] +results: + - target: std//fs//remove_dir + status: not-found + call_sites: + - caller: src/main.rs//A//run + site: src/main.rs:11 + reached: false diff --git a/test/projectgraph/cases/rust/use-shadow-root-type/project/Cargo.toml b/test/projectgraph/cases/rust/use-shadow-root-type/project/Cargo.toml new file mode 100644 index 00000000..0d44349a --- /dev/null +++ b/test/projectgraph/cases/rust/use-shadow-root-type/project/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/use-shadow-root-type/project/src/main.rs b/test/projectgraph/cases/rust/use-shadow-root-type/project/src/main.rs new file mode 100644 index 00000000..d6abed54 --- /dev/null +++ b/test/projectgraph/cases/rust/use-shadow-root-type/project/src/main.rs @@ -0,0 +1,47 @@ +mod other; + +pub struct A; + +impl A { + pub fn new() -> A { + A + } + + pub fn run(&self) { + let _ = std::fs::remove_dir("a"); + } +} + +mod deep { + use crate::other::A; + + pub struct Holder { + pub a: A, + } + + pub fn by_field(h: &Holder) { + h.a.run(); + } + + pub fn by_param(x: A) { + x.run(); + } + + pub fn by_new() { + let x = A::new(); + x.run(); + } +} + +fn by_block() { + use crate::other::A; + A::new().run(); +} + +fn main() { + deep::by_field(&deep::Holder { a: other::A::new() }); + deep::by_param(other::A::new()); + deep::by_new(); + by_block(); + let _ = A::new(); +} diff --git a/test/projectgraph/cases/rust/use-shadow-root-type/project/src/other.rs b/test/projectgraph/cases/rust/use-shadow-root-type/project/src/other.rs new file mode 100644 index 00000000..f20cbee7 --- /dev/null +++ b/test/projectgraph/cases/rust/use-shadow-root-type/project/src/other.rs @@ -0,0 +1,11 @@ +pub struct A; + +impl A { + pub fn new() -> A { + A + } + + pub fn run(&self) { + let _ = std::fs::remove_file("a"); + } +} diff --git a/test/projectgraph/cases/rust/use-shadows-module/expect.yaml b/test/projectgraph/cases/rust/use-shadows-module/expect.yaml new file mode 100644 index 00000000..36f46030 --- /dev/null +++ b/test/projectgraph/cases/rust/use-shadows-module/expect.yaml @@ -0,0 +1,59 @@ +source: safedep:hand +description: >- + src/jobs.rs declares its own inline module util, whose wipe calls std::fs::remove_file and which nothing calls. + The inline module worker has use crate::store::util, and the function flush has the same use in its block. So + util::wipe in worker::go and in flush names the module src/store/util.rs, whose wipe calls + std::fs::remove_dir_all. The call graph reads no use, so it finds util in the scope of the file and sends both + calls to the inline util. Without the rule, std::fs::remove_dir_all reads not-found. The index gives each call + the path of its use. +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/jobs.rs//worker//go + to: src/store/util.rs//wipe + kind: direct + confidence: high + site: src/jobs.rs:11 + - from: src/jobs.rs//flush + to: src/store/util.rs//wipe + kind: direct + confidence: high + site: src/jobs.rs:17 +no_edges: + - from: src/jobs.rs//worker//go + to: src/jobs.rs//util//wipe + - from: src/jobs.rs//flush + to: src/jobs.rs//util//wipe +unresolved: [] +results: + - target: std//fs//remove_dir_all + status: found + path: + - key: src/main.rs//main + - key: src/jobs.rs//worker//go + site: src/main.rs:5 + kind: direct + confidence: high + - key: src/store/util.rs//wipe + site: src/jobs.rs:11 + kind: direct + confidence: high + - key: std//fs//remove_dir_all + site: src/store/util.rs:2 + kind: direct + confidence: high + call_sites: + - caller: src/store/util.rs//wipe + site: src/store/util.rs:2 + reached: true + - target: std//fs//remove_file + status: not-found + call_sites: + - caller: src/jobs.rs//util//wipe + site: src/jobs.rs:3 + reached: false diff --git a/test/projectgraph/cases/rust/use-shadows-module/project/Cargo.toml b/test/projectgraph/cases/rust/use-shadows-module/project/Cargo.toml new file mode 100644 index 00000000..0d44349a --- /dev/null +++ b/test/projectgraph/cases/rust/use-shadows-module/project/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/use-shadows-module/project/src/jobs.rs b/test/projectgraph/cases/rust/use-shadows-module/project/src/jobs.rs new file mode 100644 index 00000000..b11ccf9e --- /dev/null +++ b/test/projectgraph/cases/rust/use-shadows-module/project/src/jobs.rs @@ -0,0 +1,18 @@ +mod util { + pub fn wipe(p: &str) { + let _ = std::fs::remove_file(p); + } +} + +pub mod worker { + use crate::store::util; + + pub fn go() { + util::wipe("x"); + } +} + +pub fn flush() { + use crate::store::util; + util::wipe("y"); +} diff --git a/test/projectgraph/cases/rust/use-shadows-module/project/src/main.rs b/test/projectgraph/cases/rust/use-shadows-module/project/src/main.rs new file mode 100644 index 00000000..a8b5cea2 --- /dev/null +++ b/test/projectgraph/cases/rust/use-shadows-module/project/src/main.rs @@ -0,0 +1,7 @@ +mod jobs; +mod store; + +fn main() { + jobs::worker::go(); + jobs::flush(); +} diff --git a/test/projectgraph/cases/rust/use-shadows-module/project/src/store/mod.rs b/test/projectgraph/cases/rust/use-shadows-module/project/src/store/mod.rs new file mode 100644 index 00000000..812d1edf --- /dev/null +++ b/test/projectgraph/cases/rust/use-shadows-module/project/src/store/mod.rs @@ -0,0 +1 @@ +pub mod util; diff --git a/test/projectgraph/cases/rust/use-shadows-module/project/src/store/util.rs b/test/projectgraph/cases/rust/use-shadows-module/project/src/store/util.rs new file mode 100644 index 00000000..c1f927fd --- /dev/null +++ b/test/projectgraph/cases/rust/use-shadows-module/project/src/store/util.rs @@ -0,0 +1,3 @@ +pub fn wipe(p: &str) { + let _ = std::fs::remove_dir_all(p); +} diff --git a/test/projectgraph/cases/rust/use-super-inline-module/expect.yaml b/test/projectgraph/cases/rust/use-super-inline-module/expect.yaml new file mode 100644 index 00000000..459385db --- /dev/null +++ b/test/projectgraph/cases/rust/use-super-inline-module/expect.yaml @@ -0,0 +1,51 @@ +source: safedep:hand +description: >- + src/net.rs declares the module tls in the file src/net/tls.rs and the inline module client. client has + use super::tls, and super of client is the module net, so tls names net::tls, and go calls tls::open, which + calls std::fs::create_dir. The root declares a module tls of its own in src/tls.rs, whose open calls + std::fs::read and which nothing calls. A link step that reads super of the inline module from the module of + the file names the tls of the root, so std::fs::create_dir reads not-found and std::fs::read reads found. +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/net.rs//client//go + to: src/net/tls.rs//open + kind: direct + confidence: high + site: src/net.rs:7 +no_edges: + - from: src/net.rs//client//go + to: src/tls.rs//open +unresolved: [] +results: + - target: std//fs//create_dir + status: found + path: + - key: src/main.rs//main + - key: src/net.rs//client//go + site: src/main.rs:5 + kind: direct + confidence: high + - key: src/net/tls.rs//open + site: src/net.rs:7 + kind: direct + confidence: high + - key: std//fs//create_dir + site: src/net/tls.rs:2 + kind: direct + confidence: high + call_sites: + - caller: src/net/tls.rs//open + site: src/net/tls.rs:2 + reached: true + - target: std//fs//read + status: not-found + call_sites: + - caller: src/tls.rs//open + site: src/tls.rs:2 + reached: false diff --git a/test/projectgraph/cases/rust/use-super-inline-module/project/Cargo.toml b/test/projectgraph/cases/rust/use-super-inline-module/project/Cargo.toml new file mode 100644 index 00000000..0d44349a --- /dev/null +++ b/test/projectgraph/cases/rust/use-super-inline-module/project/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/use-super-inline-module/project/src/main.rs b/test/projectgraph/cases/rust/use-super-inline-module/project/src/main.rs new file mode 100644 index 00000000..a2002ce8 --- /dev/null +++ b/test/projectgraph/cases/rust/use-super-inline-module/project/src/main.rs @@ -0,0 +1,6 @@ +mod net; +mod tls; + +fn main() { + net::client::go(); +} diff --git a/test/projectgraph/cases/rust/use-super-inline-module/project/src/net.rs b/test/projectgraph/cases/rust/use-super-inline-module/project/src/net.rs new file mode 100644 index 00000000..f6ce7552 --- /dev/null +++ b/test/projectgraph/cases/rust/use-super-inline-module/project/src/net.rs @@ -0,0 +1,9 @@ +pub mod tls; + +pub mod client { + use super::tls; + + pub fn go() { + tls::open(); + } +} diff --git a/test/projectgraph/cases/rust/use-super-inline-module/project/src/net/tls.rs b/test/projectgraph/cases/rust/use-super-inline-module/project/src/net/tls.rs new file mode 100644 index 00000000..f9aac751 --- /dev/null +++ b/test/projectgraph/cases/rust/use-super-inline-module/project/src/net/tls.rs @@ -0,0 +1,3 @@ +pub fn open() { + let _ = std::fs::create_dir("net"); +} diff --git a/test/projectgraph/cases/rust/use-super-inline-module/project/src/tls.rs b/test/projectgraph/cases/rust/use-super-inline-module/project/src/tls.rs new file mode 100644 index 00000000..ee18742b --- /dev/null +++ b/test/projectgraph/cases/rust/use-super-inline-module/project/src/tls.rs @@ -0,0 +1,3 @@ +pub fn open() { + let _ = std::fs::read("root"); +} diff --git a/test/projectgraph/cases/rust/use-type-receiver/expect.yaml b/test/projectgraph/cases/rust/use-type-receiver/expect.yaml new file mode 100644 index 00000000..cfcc96a1 --- /dev/null +++ b/test/projectgraph/cases/rust/use-type-receiver/expect.yaml @@ -0,0 +1,95 @@ +source: safedep:hand +description: >- + src/store.rs declares the struct Item, and its inline module cache declares another Item. The inline module + cache::deep has use crate::store::Item, so x in by_new and in by_value holds the Item of the root, and x.save() + runs Item::save of the root, which calls std::fs::write. The call graph reads no use, so it finds the Item of + cache for Item::new() and for Item, and sends x.save() to cache::Item::save, which calls std::fs::create_dir. + Without the rule, std::fs::write reads not-found. The index gives the call the path of the use. In main.rs, + qualified has use crate::b::Item and calls x.save() after let x = a::Item::new(). The path a::Item names its + type through a, and the use of Item does not bind a, so x.save() runs a::Item::save, which calls + std::fs::remove_file. A rule that rebinds the last name of the type sends the call to b::Item::save, so + std::fs::remove_dir reads found and std::fs::remove_file reads not-found. +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/store.rs//cache//deep//by_new + to: src/store.rs//Item//save + kind: member + confidence: high + site: src/store.rs:31 + - from: src/store.rs//cache//deep//by_value + to: src/store.rs//Item//save + kind: member + confidence: high + site: src/store.rs:36 + - from: src/main.rs//qualified + to: src/main.rs//a//Item//save + kind: member + confidence: high + site: src/main.rs:31 +no_edges: + - from: src/main.rs//qualified + to: src/main.rs//b//Item//save + - from: src/store.rs//cache//deep//by_new + to: src/store.rs//cache//Item//save + - from: src/store.rs//cache//deep//by_value + to: src/store.rs//cache//Item//save +unresolved: [] +results: + - target: std//fs//write + status: found + path: + - key: src/main.rs//main + - key: src/store.rs//cache//deep//by_new + site: src/main.rs:35 + kind: direct + confidence: high + - key: src/store.rs//Item//save + site: src/store.rs:31 + kind: member + confidence: high + - key: std//fs//write + site: src/store.rs:5 + kind: direct + confidence: high + call_sites: + - caller: src/store.rs//Item//save + site: src/store.rs:5 + reached: true + - target: std//fs//create_dir + status: not-found + call_sites: + - caller: src/store.rs//cache//Item//save + site: src/store.rs:18 + reached: false + - target: std//fs//remove_file + status: found + path: + - key: src/main.rs//main + - key: src/main.rs//qualified + site: src/main.rs:37 + kind: direct + confidence: high + - key: src/main.rs//a//Item//save + site: src/main.rs:31 + kind: member + confidence: high + - key: std//fs//remove_file + site: src/main.rs:12 + kind: direct + confidence: high + call_sites: + - caller: src/main.rs//a//Item//save + site: src/main.rs:12 + reached: true + - target: std//fs//remove_dir + status: not-found + call_sites: + - caller: src/main.rs//b//Item//save + site: src/main.rs:22 + reached: false diff --git a/test/projectgraph/cases/rust/use-type-receiver/project/Cargo.toml b/test/projectgraph/cases/rust/use-type-receiver/project/Cargo.toml new file mode 100644 index 00000000..0d44349a --- /dev/null +++ b/test/projectgraph/cases/rust/use-type-receiver/project/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/use-type-receiver/project/src/main.rs b/test/projectgraph/cases/rust/use-type-receiver/project/src/main.rs new file mode 100644 index 00000000..624e751f --- /dev/null +++ b/test/projectgraph/cases/rust/use-type-receiver/project/src/main.rs @@ -0,0 +1,38 @@ +mod store; + +mod a { + pub struct Item; + + impl Item { + pub fn new() -> Item { + Item + } + + pub fn save(&self) { + let _ = std::fs::remove_file("a"); + } + } +} + +mod b { + pub struct Item; + + impl Item { + pub fn save(&self) { + let _ = std::fs::remove_dir("b"); + } + } +} + +fn qualified() { + use crate::b::Item; + let _b = Item; + let x = a::Item::new(); + x.save(); +} + +fn main() { + store::cache::deep::by_new(); + store::cache::deep::by_value(); + qualified(); +} diff --git a/test/projectgraph/cases/rust/use-type-receiver/project/src/store.rs b/test/projectgraph/cases/rust/use-type-receiver/project/src/store.rs new file mode 100644 index 00000000..efdedfbd --- /dev/null +++ b/test/projectgraph/cases/rust/use-type-receiver/project/src/store.rs @@ -0,0 +1,39 @@ +pub struct Item; + +impl Item { + pub fn save(&self) { + let _ = std::fs::write("top", "x"); + } + + pub fn new() -> Item { + Item + } +} + +pub mod cache { + pub struct Item; + + impl Item { + pub fn save(&self) { + let _ = std::fs::create_dir("cache"); + } + + pub fn new() -> Item { + Item + } + } + + pub mod deep { + use crate::store::Item; + + pub fn by_new() { + let x = Item::new(); + x.save(); + } + + pub fn by_value() { + let x = Item; + x.save(); + } + } +} diff --git a/test/projectgraph/cases/rust/use-type-result/expect.yaml b/test/projectgraph/cases/rust/use-type-result/expect.yaml new file mode 100644 index 00000000..96fd4bd4 --- /dev/null +++ b/test/projectgraph/cases/rust/use-type-result/expect.yaml @@ -0,0 +1,39 @@ +source: safedep:hand +description: >- + src/store.rs declares the struct Item, and its inline module cache declares another Item. The inline module + cache::deep has use crate::store::Item, so the result of make and the field item of Holder hold the Item of the + root. make().save() and h.item.save() run Item::save of the root, which calls std::fs::write. The save of + cache::Item calls std::fs::create_dir and nothing calls it. An index that drops a type that a use declares + gives each call a record and the low name edges of both save methods, so std::fs::create_dir reads found. The + index writes the path of the use, crate::store::Item, so each call keeps one edge. +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/store.rs//cache//deep//by_result + to: src/store.rs//Item//save + kind: member + confidence: high + site: src/store.rs:30 + - from: src/store.rs//cache//deep//by_field + to: src/store.rs//Item//save + kind: member + confidence: high + site: src/store.rs:35 +no_edges: + - from: src/store.rs//cache//deep//by_result + to: src/store.rs//cache//Item//save + - from: src/store.rs//cache//deep//by_field + to: src/store.rs//cache//Item//save +unresolved: [] +results: + - target: std//fs//create_dir + status: not-found + call_sites: + - caller: src/store.rs//cache//Item//save + site: src/store.rs:14 + reached: false diff --git a/test/projectgraph/cases/rust/use-type-result/project/Cargo.toml b/test/projectgraph/cases/rust/use-type-result/project/Cargo.toml new file mode 100644 index 00000000..0d44349a --- /dev/null +++ b/test/projectgraph/cases/rust/use-type-result/project/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/use-type-result/project/src/main.rs b/test/projectgraph/cases/rust/use-type-result/project/src/main.rs new file mode 100644 index 00000000..650de6e4 --- /dev/null +++ b/test/projectgraph/cases/rust/use-type-result/project/src/main.rs @@ -0,0 +1,6 @@ +mod store; + +fn main() { + store::cache::deep::by_result(); + store::cache::deep::by_field(); +} diff --git a/test/projectgraph/cases/rust/use-type-result/project/src/store.rs b/test/projectgraph/cases/rust/use-type-result/project/src/store.rs new file mode 100644 index 00000000..4bb2846b --- /dev/null +++ b/test/projectgraph/cases/rust/use-type-result/project/src/store.rs @@ -0,0 +1,38 @@ +pub struct Item; + +impl Item { + pub fn save(&self) { + let _ = std::fs::write("top", "x"); + } +} + +pub mod cache { + pub struct Item; + + impl Item { + pub fn save(&self) { + let _ = std::fs::create_dir("cache"); + } + } + + pub mod deep { + use crate::store::Item; + + pub struct Holder { + pub item: Item, + } + + pub fn make() -> Item { + Item + } + + pub fn by_result() { + make().save(); + } + + pub fn by_field() { + let h = Holder { item: Item }; + h.item.save(); + } + } +} diff --git a/test/projectgraph/cases/rust/value-path-module/expect.yaml b/test/projectgraph/cases/rust/value-path-module/expect.yaml new file mode 100644 index 00000000..82c4eb98 --- /dev/null +++ b/test/projectgraph/cases/rust/value-path-module/expect.yaml @@ -0,0 +1,59 @@ +source: safedep:hand +description: >- + main reads the constant config::LIMIT and the variant config::Mode::Fast into variables, and then calls + config::load and config::apply. A path that names a value starts with a module, never with a variable. A call + graph that reads config of config::LIMIT as a variable of main binds config there, so config::load(limit) + reads config as a receiver and gets the record unknown-receiver with no edge. std::fs::remove_file and + std::fs::remove_dir then read not-found. +roots: + - key: src/main.rs + kind: main + rule: rust.main + - key: src/main.rs//main + kind: main + rule: rust.main +edges: + - from: src/main.rs//main + to: src/config.rs//load + kind: direct + confidence: high + site: src/main.rs:5 + - from: src/main.rs//main + to: src/config.rs//apply + kind: direct + confidence: high + site: src/main.rs:7 +unresolved: [] +results: + - target: std//fs//remove_file + status: found + path: + - key: src/main.rs//main + - key: src/config.rs//load + site: src/main.rs:5 + kind: direct + confidence: high + - key: std//fs//remove_file + site: src/config.rs:8 + kind: direct + confidence: high + call_sites: + - caller: src/config.rs//load + site: src/config.rs:8 + reached: true + - target: std//fs//remove_dir + status: found + path: + - key: src/main.rs//main + - key: src/config.rs//apply + site: src/main.rs:7 + kind: direct + confidence: high + - key: std//fs//remove_dir + site: src/config.rs:12 + kind: direct + confidence: high + call_sites: + - caller: src/config.rs//apply + site: src/config.rs:12 + reached: true diff --git a/test/projectgraph/cases/rust/value-path-module/project/Cargo.toml b/test/projectgraph/cases/rust/value-path-module/project/Cargo.toml new file mode 100644 index 00000000..0d44349a --- /dev/null +++ b/test/projectgraph/cases/rust/value-path-module/project/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" diff --git a/test/projectgraph/cases/rust/value-path-module/project/src/config.rs b/test/projectgraph/cases/rust/value-path-module/project/src/config.rs new file mode 100644 index 00000000..c26dc8ab --- /dev/null +++ b/test/projectgraph/cases/rust/value-path-module/project/src/config.rs @@ -0,0 +1,13 @@ +pub const LIMIT: u32 = 3; + +pub enum Mode { + Fast, +} + +pub fn load(_limit: u32) { + let _ = std::fs::remove_file("x"); +} + +pub fn apply(_mode: Mode) { + let _ = std::fs::remove_dir("x"); +} diff --git a/test/projectgraph/cases/rust/value-path-module/project/src/main.rs b/test/projectgraph/cases/rust/value-path-module/project/src/main.rs new file mode 100644 index 00000000..9b69b09d --- /dev/null +++ b/test/projectgraph/cases/rust/value-path-module/project/src/main.rs @@ -0,0 +1,8 @@ +mod config; + +fn main() { + let limit = config::LIMIT; + config::load(limit); + let mode = config::Mode::Fast; + config::apply(mode); +} diff --git a/test/projectgraph/cases/typescript/next-route-assertion/expect.yaml b/test/projectgraph/cases/typescript/next-route-assertion/expect.yaml new file mode 100644 index 00000000..3209c05f --- /dev/null +++ b/test/projectgraph/cases/typescript/next-route-assertion/expect.yaml @@ -0,0 +1,39 @@ +source: safedep:hand +description: >- + The route exports GET as the result of the call createHandler under an angle-bracket assertion. The + assertion holds its type first and its value last, so the index reads the call, and the export is + opaque. kit calls onRequest of its argument, and no edge names it. So the export gets a computed-name + record, and a3 reads uncertain and not not-found. +roots: + - key: app/api/x/route.ts + kind: framework + rule: node.next.route + - key: app/api/x/route.ts//GET + kind: framework + rule: node.next.route +exact_edges: true +edges: + - from: app/api/x/route.ts + to: kit//createHandler + kind: direct + confidence: high + site: app/api/x/route.ts:6 + - from: app/api/x/route.ts//onRequest + to: plug//a3 + kind: direct + confidence: high + site: app/api/x/route.ts:8 +unresolved: + - caller: app/api/x/route.ts + site: app/api/x/route.ts:6 + reason: computed-name +results: + - target: plug//a3 + status: uncertain + call_sites: + - caller: app/api/x/route.ts//onRequest + site: app/api/x/route.ts:8 + reached: false + uncertainties: + - kind: unresolved-call + site: app/api/x/route.ts:6 diff --git a/test/projectgraph/cases/typescript/next-route-assertion/project/app/api/x/route.ts b/test/projectgraph/cases/typescript/next-route-assertion/project/app/api/x/route.ts new file mode 100644 index 00000000..6d34b07b --- /dev/null +++ b/test/projectgraph/cases/typescript/next-route-assertion/project/app/api/x/route.ts @@ -0,0 +1,10 @@ +import { createHandler } from 'kit'; +import { a3 } from 'plug'; + +type Handler = (req: Request) => Promise; + +export const GET = createHandler({ + onRequest() { + a3(); + }, +}); diff --git a/test/projectgraph/cases/typescript/next-route-assertion/project/package.json b/test/projectgraph/cases/typescript/next-route-assertion/project/package.json new file mode 100644 index 00000000..b005ba98 --- /dev/null +++ b/test/projectgraph/cases/typescript/next-route-assertion/project/package.json @@ -0,0 +1 @@ +{ "name": "next-route-assertion", "dependencies": { "next": "^14.2.0" } } diff --git a/test/projectgraph/cases/typescript/next-route-literals/expect.yaml b/test/projectgraph/cases/typescript/next-route-literals/expect.yaml new file mode 100644 index 00000000..0c5c0e2d --- /dev/null +++ b/test/projectgraph/cases/typescript/next-route-literals/expect.yaml @@ -0,0 +1,60 @@ +source: safedep:hand +description: >- + route.ts exports constants whose values run no call, as 60 * 60, 'force-dynamic' as const, -1, an + object with satisfies and an object that reads process.env inside a literal. They are no opaque exports + and get no record, so dead, which only the unused function of lib/db.ts calls, stays not-found. +roots: + - key: app/api/x/route.ts + kind: framework + rule: node.next.route + - key: app/api/x/route.ts//GET + kind: framework + rule: node.next.route + - key: app/api/x/route.ts//config + kind: framework + rule: node.next.route + - key: app/api/x/route.ts//dynamic + kind: framework + rule: node.next.route + - key: app/api/x/route.ts//maxDuration + kind: framework + rule: node.next.route + - key: app/api/x/route.ts//metadata + kind: framework + rule: node.next.route + - key: app/api/x/route.ts//revalidate + kind: framework + rule: node.next.route +exact_edges: true +edges: + - from: app/api/x/route.ts//GET + to: plug//a1 + kind: direct + confidence: high + site: app/api/x/route.ts:11 + - from: lib/db.ts//unused + to: plug//dead + kind: direct + confidence: high + site: lib/db.ts:4 +unresolved: [] +results: + - target: plug//a1 + status: found + path: + - key: app/api/x/route.ts//GET + root: framework + - key: plug//a1 + site: app/api/x/route.ts:11 + kind: direct + confidence: high + call_sites: + - caller: app/api/x/route.ts//GET + site: app/api/x/route.ts:11 + reached: true + - target: plug//dead + status: not-found + call_sites: + - caller: lib/db.ts//unused + site: lib/db.ts:4 + reached: false diff --git a/test/projectgraph/cases/typescript/next-route-literals/project/app/api/x/route.ts b/test/projectgraph/cases/typescript/next-route-literals/project/app/api/x/route.ts new file mode 100644 index 00000000..1b5c65d9 --- /dev/null +++ b/test/projectgraph/cases/typescript/next-route-literals/project/app/api/x/route.ts @@ -0,0 +1,12 @@ +import type { Metadata } from 'next'; +import { a1 } from 'plug'; + +export const revalidate = 60 * 60; +export const dynamic = 'force-dynamic' as const; +export const maxDuration = -1; +export const metadata = { title: 'x' } satisfies Metadata; +export const config = { api: { bodyParser: !process.env.RAW } }; + +export async function GET() { + a1(); +} diff --git a/test/projectgraph/cases/typescript/next-route-literals/project/lib/db.ts b/test/projectgraph/cases/typescript/next-route-literals/project/lib/db.ts new file mode 100644 index 00000000..096a7eb7 --- /dev/null +++ b/test/projectgraph/cases/typescript/next-route-literals/project/lib/db.ts @@ -0,0 +1,5 @@ +import { dead } from 'plug'; + +export function unused() { + dead(); +} diff --git a/test/projectgraph/cases/typescript/next-route-literals/project/package.json b/test/projectgraph/cases/typescript/next-route-literals/project/package.json new file mode 100644 index 00000000..5a4929a1 --- /dev/null +++ b/test/projectgraph/cases/typescript/next-route-literals/project/package.json @@ -0,0 +1 @@ +{ "name": "next-route-literals", "dependencies": { "next": "^14.2.0" } } diff --git a/test/projectgraph/cases/typescript/next-route-opaque/expect.yaml b/test/projectgraph/cases/typescript/next-route-opaque/expect.yaml new file mode 100644 index 00000000..d5f993bf --- /dev/null +++ b/test/projectgraph/cases/typescript/next-route-opaque/expect.yaml @@ -0,0 +1,77 @@ +source: safedep:hand +description: >- + app/api/auth/route.ts exports the result of the call NextAuth as its default, and app/api/x/route.ts + exports GET and POST from handlers, which lib/auth.ts makes by a call. Next.js calls the functions of + these values, and no edge names them. So each export gets a computed-name record of the JavaScript + family in place of a root, and a1 and a2 read uncertain and not not-found. +roots: + - key: app/api/auth/route.ts + kind: framework + rule: node.next.route + - key: app/api/x/route.ts + kind: framework + rule: node.next.route +exact_edges: true +edges: + - from: app/api/auth/route.ts + to: next-auth + kind: direct + confidence: high + site: app/api/auth/route.ts:4 + - from: app/api/auth/route.ts//callbacks//signIn + to: plug//a1 + kind: direct + confidence: high + site: app/api/auth/route.ts:4 + - from: app/api/x/route.ts + to: lib/auth.ts + kind: import + confidence: high + site: app/api/x/route.ts:1 + - from: lib/auth.ts + to: lib/auth.ts//makeAll + kind: direct + confidence: high + site: lib/auth.ts:7 + - from: lib/auth.ts//makeAll//GET + to: plug//a2 + kind: direct + confidence: high + site: lib/auth.ts:4 +unresolved: + - caller: app/api/auth/route.ts + site: app/api/auth/route.ts:4 + reason: computed-name + - caller: app/api/x/route.ts + site: app/api/x/route.ts:3 + reason: computed-name + - caller: app/api/x/route.ts + site: app/api/x/route.ts:3 + reason: computed-name +results: + - target: plug//a1 + status: uncertain + call_sites: + - caller: app/api/auth/route.ts//callbacks//signIn + site: app/api/auth/route.ts:4 + reached: false + uncertainties: + - kind: unresolved-call + site: app/api/auth/route.ts:4 + - kind: unresolved-call + site: app/api/x/route.ts:3 + - kind: unresolved-call + site: app/api/x/route.ts:3 + - target: plug//a2 + status: uncertain + call_sites: + - caller: lib/auth.ts//makeAll//GET + site: lib/auth.ts:4 + reached: false + uncertainties: + - kind: unresolved-call + site: app/api/auth/route.ts:4 + - kind: unresolved-call + site: app/api/x/route.ts:3 + - kind: unresolved-call + site: app/api/x/route.ts:3 diff --git a/test/projectgraph/cases/typescript/next-route-opaque/project/app/api/auth/route.ts b/test/projectgraph/cases/typescript/next-route-opaque/project/app/api/auth/route.ts new file mode 100644 index 00000000..3da95a6e --- /dev/null +++ b/test/projectgraph/cases/typescript/next-route-opaque/project/app/api/auth/route.ts @@ -0,0 +1,4 @@ +import NextAuth from 'next-auth'; +import { a1 } from 'plug'; + +export default NextAuth({ callbacks: { async signIn() { a1(); } } }); diff --git a/test/projectgraph/cases/typescript/next-route-opaque/project/app/api/x/route.ts b/test/projectgraph/cases/typescript/next-route-opaque/project/app/api/x/route.ts new file mode 100644 index 00000000..c7a254ca --- /dev/null +++ b/test/projectgraph/cases/typescript/next-route-opaque/project/app/api/x/route.ts @@ -0,0 +1,3 @@ +import { handlers } from '../../../lib/auth'; + +export const { GET, POST } = handlers; diff --git a/test/projectgraph/cases/typescript/next-route-opaque/project/lib/auth.ts b/test/projectgraph/cases/typescript/next-route-opaque/project/lib/auth.ts new file mode 100644 index 00000000..338cc5f5 --- /dev/null +++ b/test/projectgraph/cases/typescript/next-route-opaque/project/lib/auth.ts @@ -0,0 +1,7 @@ +import { a2 } from 'plug'; + +function makeAll() { + return { GET: async () => { a2(); } }; +} + +export const handlers = makeAll(); diff --git a/test/projectgraph/cases/typescript/next-route-opaque/project/package.json b/test/projectgraph/cases/typescript/next-route-opaque/project/package.json new file mode 100644 index 00000000..1f4c6a2f --- /dev/null +++ b/test/projectgraph/cases/typescript/next-route-opaque/project/package.json @@ -0,0 +1 @@ +{ "name": "next-route-opaque", "dependencies": { "next": "^14.2.0", "next-auth": "^4.24.0" } } diff --git a/test/projectgraph/cases/typescript/next-route-test-dir/expect.yaml b/test/projectgraph/cases/typescript/next-route-test-dir/expect.yaml new file mode 100644 index 00000000..7889edc1 --- /dev/null +++ b/test/projectgraph/cases/typescript/next-route-test-dir/expect.yaml @@ -0,0 +1,71 @@ +source: safedep:hand +description: >- + A route of the app has a path under a test path, as app/api/test or app/spec. The route rule + names its files by their path in the app, so it marks them although they are test files, and probe + and render are found. Only the rule node.component skips a file of a test path. +test_paths: [test, tests, spec] +roots: + - key: app/api/test/route.ts + kind: framework + rule: node.next.route + - key: app/api/test/route.ts + kind: test + rule: test.files + - key: app/api/test/route.ts//GET + kind: framework + rule: node.next.route + - key: app/api/test/route.ts//GET + kind: test + rule: test.files + - key: app/spec/page.tsx + kind: framework + rule: node.next.route + - key: app/spec/page.tsx + kind: test + rule: test.files + - key: app/spec/page.tsx//Page + kind: framework + rule: node.next.route + - key: app/spec/page.tsx//Page + kind: test + rule: test.files +exact_edges: true +edges: + - from: app/api/test/route.ts//GET + to: plug//probe + kind: direct + confidence: high + site: app/api/test/route.ts:4 + - from: app/spec/page.tsx//Page + to: plug//render + kind: direct + confidence: high + site: app/spec/page.tsx:4 +unresolved: [] +results: + - target: plug//probe + status: found + path: + - key: app/api/test/route.ts//GET + root: framework + - key: plug//probe + site: app/api/test/route.ts:4 + kind: direct + confidence: high + call_sites: + - caller: app/api/test/route.ts//GET + site: app/api/test/route.ts:4 + reached: true + - target: plug//render + status: found + path: + - key: app/spec/page.tsx//Page + root: framework + - key: plug//render + site: app/spec/page.tsx:4 + kind: direct + confidence: high + call_sites: + - caller: app/spec/page.tsx//Page + site: app/spec/page.tsx:4 + reached: true diff --git a/test/projectgraph/cases/typescript/next-route-test-dir/project/app/api/test/route.ts b/test/projectgraph/cases/typescript/next-route-test-dir/project/app/api/test/route.ts new file mode 100644 index 00000000..82804eb6 --- /dev/null +++ b/test/projectgraph/cases/typescript/next-route-test-dir/project/app/api/test/route.ts @@ -0,0 +1,5 @@ +import { probe } from 'plug'; + +export async function GET() { + return probe(); +} diff --git a/test/projectgraph/cases/typescript/next-route-test-dir/project/app/spec/page.tsx b/test/projectgraph/cases/typescript/next-route-test-dir/project/app/spec/page.tsx new file mode 100644 index 00000000..9a022ea4 --- /dev/null +++ b/test/projectgraph/cases/typescript/next-route-test-dir/project/app/spec/page.tsx @@ -0,0 +1,5 @@ +import { render } from 'plug'; + +export default function Page() { + return render(); +} diff --git a/test/projectgraph/cases/typescript/next-route-test-dir/project/package.json b/test/projectgraph/cases/typescript/next-route-test-dir/project/package.json new file mode 100644 index 00000000..ffe18ea4 --- /dev/null +++ b/test/projectgraph/cases/typescript/next-route-test-dir/project/package.json @@ -0,0 +1 @@ +{ "name": "next-route-test-dir", "dependencies": { "next": "^14.2.0" } } diff --git a/test/projectgraph/deadline_test.go b/test/projectgraph/deadline_test.go index 4dd72c1c..a2586d5c 100644 --- a/test/projectgraph/deadline_test.go +++ b/test/projectgraph/deadline_test.go @@ -4,7 +4,6 @@ import ( "context" "fmt" "os" - "path/filepath" "strings" "testing" "time" @@ -12,6 +11,7 @@ import ( codefs "github.com/safedep/code/fs" "github.com/safedep/code/plugin/indexer" "github.com/safedep/code/projectgraph" + "github.com/safedep/code/projectgraph/reach" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -22,26 +22,22 @@ import ( // work grows with the orders of the files. The build must end soon after // its deadline, as a scan gives the link step a budget. func TestBuildStopsAtTheDeadline(t *testing.T) { - const files = 10 - dir := t.TempDir() - write := func(name, text string) { - require.NoError(t, os.MkdirAll(filepath.Dir(filepath.Join(dir, name)), 0o755)) - require.NoError(t, os.WriteFile(filepath.Join(dir, name), []byte(text), 0o644)) - } - write("Cargo.toml", "[package]\nname = \"app\"\nversion = \"0.1.0\"\n") + const count = 10 + files := map[string]string{"Cargo.toml": "[package]\nname = \"app\"\nversion = \"0.1.0\"\n"} var lib strings.Builder - for i := range files { + for i := range count { fmt.Fprintf(&lib, "pub mod f%d;\n", i) var file strings.Builder - for j := range files { + for j := range count { if j != i { fmt.Fprintf(&file, "pub use crate::f%d::E::*;\n", j) } } file.WriteString("pub fn run() {\n missing();\n}\n") - write(fmt.Sprintf("src/f%d.rs", i), file.String()) + files[fmt.Sprintf("src/f%d.rs", i)] = file.String() } - write("src/lib.rs", lib.String()) + files["src/lib.rs"] = lib.String() + dir := writeFiles(t, files) fsys, err := codefs.NewLocalFileSystem(codefs.LocalFileSystemConfig{AppDirectories: []string{dir}}) require.NoError(t, err) @@ -54,3 +50,120 @@ func TestBuildStopsAtTheDeadline(t *testing.T) { assert.ErrorIs(t, err, context.DeadlineExceeded) assert.Less(t, time.Since(start), 10*time.Second) } + +// TestBuildReadsEachGlobModuleOncePerName links two layouts of Rust glob +// uses. In the first, nine files each glob use every other file. In the +// second, a chain of twenty levels of two files each glob uses both files of +// the next level, and only one file of the last level defines leaf. A +// lookup that reads a module once per path through the glob uses grows +// with the number of paths. The build must read each glob module once per +// name, so it ends well within the budget and reaches remove_file. +func TestBuildReadsEachGlobModuleOncePerName(t *testing.T) { + complete := map[string]string{} + var main strings.Builder + for i := range 9 { + fmt.Fprintf(&main, "mod m%d;\n", i) + var file strings.Builder + for j := range 9 { + if j != i { + fmt.Fprintf(&file, "pub use crate::m%d::*;\n", j) + } + } + fmt.Fprintf(&file, "\npub fn f%d() {\n let _ = std::fs::remove_file(\"a\");\n}\n", i) + complete[fmt.Sprintf("src/m%d.rs", i)] = file.String() + } + main.WriteString("\nuse m0::*;\n\nfn main() {\n f0();\n gone();\n}\n") + complete["src/main.rs"] = main.String() + + const levels = 20 + diamond := map[string]string{} + main.Reset() + for i := range levels { + for _, side := range []string{"a", "b"} { + fmt.Fprintf(&main, "mod l%d%s;\n", i, side) + var file strings.Builder + if i+1 < levels { + fmt.Fprintf(&file, "pub use crate::l%da::*;\npub use crate::l%db::*;\n", i+1, i+1) + } else if side == "a" { + file.WriteString("pub fn leaf() {\n let _ = std::fs::remove_file(\"a\");\n}\n") + } + fmt.Fprintf(&file, "\npub fn own_%d%s() {}\n", i, side) + diamond[fmt.Sprintf("src/l%d%s.rs", i, side)] = file.String() + } + } + main.WriteString("\nuse l0a::*;\n\nfn main() {\n leaf();\n gone();\n}\n") + diamond["src/main.rs"] = main.String() + + for name, files := range map[string]map[string]string{"complete": complete, "diamond": diamond} { + t.Run(name, func(t *testing.T) { + files["Cargo.toml"] = "[package]\nname = \"app\"\nversion = \"0.1.0\"\n" + dir := writeFiles(t, files) + fsys, err := codefs.NewLocalFileSystem(codefs.LocalFileSystemConfig{AppDirectories: []string{dir}}) + require.NoError(t, err) + indexed := indexProject(t, fsys, indexer.Options{Languages: caseLanguages(t)}) + + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) + defer cancel() + g, err := projectgraph.Build(ctx, indexed.Indexes, projectgraph.Options{Root: os.DirFS(dir), Files: indexed.Statuses(), Languages: indexed.Languages}) + require.NoError(t, err) + results, err := reach.Reach(ctx, g, reach.Query{Targets: targetsOf(t, "std//fs//remove_file")}) + require.NoError(t, err) + require.Len(t, results, 1) + assert.Equal(t, reach.Found, results[0].Status) + }) + } +} + +// TestBuildReadsEachGlobPathOnceInARingOfCrates links six crates of +// dependency code whose roots glob use the next crate, the last one back +// to the first, and a crate leaf that the last one also glob uses. Each +// file of the project glob uses one crate of the ring and calls n::f of +// leaf. The build must read each glob path of the ring once, so it ends +// well within the budget and reaches n::f. +func TestBuildReadsEachGlobPathOnceInARingOfCrates(t *testing.T) { + const crates = 6 + files := map[string]string{} + manifest := func(name string, deps ...string) string { + var m strings.Builder + fmt.Fprintf(&m, "[package]\nname = \"%s\"\nversion = \"1.0.0\"\nedition = \"2021\"\n\n[dependencies]\n", name) + for _, d := range deps { + fmt.Fprintf(&m, "%s = \"1.0.0\"\n", d) + } + return m.String() + } + want := expectation{Units: map[string]string{"vendor/leaf": "cargo:leaf@1.0.0"}} + var main, deps []string + for i := range crates { + name, next := fmt.Sprintf("ring_%d", i), fmt.Sprintf("ring_%d", (i+1)%crates) + want.Units["vendor/"+name] = fmt.Sprintf("cargo:%s@1.0.0", name) + lib := "pub use " + next + "::*;\n" + uses := []string{next} + if i == crates-1 { + lib += "pub use leaf::*;\n" + uses = append(uses, "leaf") + } + files["vendor/"+name+"/Cargo.toml"] = manifest(name, uses...) + files["vendor/"+name+"/src/lib.rs"] = lib + files[fmt.Sprintf("src/c%d.rs", i)] = fmt.Sprintf("use %s::*;\n\npub fn go() {\n n::f();\n}\n", name) + main = append(main, fmt.Sprintf("mod c%d;", i)) + deps = append(deps, name) + } + files["vendor/leaf/Cargo.toml"] = manifest("leaf") + files["vendor/leaf/src/lib.rs"] = "pub mod n;\n" + files["vendor/leaf/src/n.rs"] = "pub fn f() {\n let _ = std::fs::remove_file(\"a\");\n}\n" + files["Cargo.toml"] = manifest("app", deps...) + files["src/main.rs"] = strings.Join(main, "\n") + "\n\nfn main() {\n c0::go();\n}\n" + dir := writeFiles(t, files) + cfg, roots := fileSystemConfig(dir, want) + fsys, err := codefs.NewLocalFileSystem(cfg) + require.NoError(t, err) + indexed := indexProject(t, fsys, indexer.Options{Languages: caseLanguages(t), Imports: true}) + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) + defer cancel() + g, err := projectgraph.Build(ctx, indexed.Indexes, projectgraph.Options{Root: os.DirFS(dir), Files: indexed.Statuses(), Languages: indexed.Languages, Units: roots}) + require.NoError(t, err) + results, err := reach.Reach(ctx, g, reach.Query{Targets: targetsOf(t, "leaf//n//f")}) + require.NoError(t, err) + require.Len(t, results, 1) + assert.Equal(t, reach.Found, results[0].Status) +} diff --git a/test/projectgraph/glob_test.go b/test/projectgraph/glob_test.go new file mode 100644 index 00000000..542ccc04 --- /dev/null +++ b/test/projectgraph/glob_test.go @@ -0,0 +1,42 @@ +package projectgraph + +import ( + "context" + "fmt" + "os" + "testing" + + codefs "github.com/safedep/code/fs" + "github.com/safedep/code/plugin/indexer" + "github.com/safedep/code/projectgraph" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +// TestBuildRustKeepsNoGlobListThatACutGave links src/other.rs, which glob +// uses crate::sub::x and crate::c. sub gives x only through its own glob use +// of other, so the read of the glob uses of other asks for other again +// under the guard of a glob member. That read gets no module for +// crate::sub::x. The list of the glob modules of other that the build keeps +// must still hold c::x, so g() in run links g of src/c/x.rs through the +// glob use. +func TestBuildRustKeepsNoGlobListThatACutGave(t *testing.T) { + dir := writeFiles(t, map[string]string{ + "Cargo.toml": "[package]\nname = \"app\"\nversion = \"1.0.0\"\nedition = \"2021\"\n", + "src/main.rs": "mod c;\nmod other;\nmod sub;\n\nuse sub::*;\n\nfn main() {\n x::g();\n other::run();\n}\n", + "src/c/mod.rs": "pub mod x;\n", + "src/c/x.rs": "pub fn g() {}\n", + "src/other.rs": "use crate::sub::x::*;\npub use crate::c::*;\n\npub fn run() {\n g();\n}\n", + "src/sub.rs": "pub use crate::other::*;\n", + }) + fsys, err := codefs.NewLocalFileSystem(codefs.LocalFileSystemConfig{AppDirectories: []string{dir}}) + require.NoError(t, err) + indexed := indexProject(t, fsys, indexer.Options{Languages: caseLanguages(t)}) + g, err := projectgraph.Build(context.Background(), indexed.Indexes, projectgraph.Options{Root: os.DirFS(dir), Files: indexed.Statuses(), Languages: indexed.Languages}) + require.NoError(t, err) + var edges []string + for _, e := range g.Edges { + edges = append(edges, fmt.Sprintf("%s -> %s %s %s", e.From, e.To, e.Kind, e.Resolver)) + } + assert.Contains(t, edges, "src/other.rs//run -> src/c/x.rs//g direct rust.wildcard-import") +} diff --git a/test/projectgraph/helpers_test.go b/test/projectgraph/helpers_test.go index 7af3ebca..14f5b9e5 100644 --- a/test/projectgraph/helpers_test.go +++ b/test/projectgraph/helpers_test.go @@ -3,6 +3,7 @@ package projectgraph import ( "context" "os" + "path/filepath" "testing" "github.com/safedep/code/core" @@ -47,3 +48,16 @@ func linkProject(t testing.TB, root string, indexed *indexer.Result, opts projec require.NoError(t, err) return g } + +// writeFiles writes the files, by their slash paths, to a new temporary +// directory and returns the directory. +func writeFiles(t testing.TB, files map[string]string) string { + t.Helper() + dir := t.TempDir() + for p, text := range files { + file := filepath.Join(dir, filepath.FromSlash(p)) + require.NoError(t, os.MkdirAll(filepath.Dir(file), 0o755)) + require.NoError(t, os.WriteFile(file, []byte(text), 0o644)) + } + return dir +} diff --git a/test/projectgraph/public/methods/corpus.txt b/test/projectgraph/public/methods/corpus.txt index 14db9e55..8d13e151 100644 --- a/test/projectgraph/public/methods/corpus.txt +++ b/test/projectgraph/public/methods/corpus.txt @@ -3,7 +3,7 @@ # advisory of advisories.json names at its pinned version. go bluemonday github.com/microcosm-cc/bluemonday@v1.0.16 golang.org/x/net@v0.0.0-20210614182718-04defd469f4e go goquery github.com/PuerkitoBio/goquery@v1.8.0 golang.org/x/net@v0.0.0-20210916014120-12bc252f5db8 -go colly github.com/gocolly/colly/v2@v2.1.0 github.com/antchfx/xmlquery@v1.2.4 github.com/antchfx/xpath@v1.1.8 golang.org/x/crypto@v0.0.0-20190605123033-f99c8df09eb5 golang.org/x/net@v0.0.0-20200602114024-627f9648deb9 google.golang.org/protobuf@v1.24.0 +go colly github.com/gocolly/colly/v2@v2.1.0 github.com/antchfx/xmlquery@v1.2.4 github.com/antchfx/xpath@v1.1.8 golang.org/x/crypto@v0.0.0-20190605123033-f99c8df09eb5 golang.org/x/net@v0.0.0-20200602114024-627f9648deb9 golang.org/x/text@v0.3.2 google.golang.org/protobuf@v1.24.0 go hey github.com/rakyll/hey@v0.1.4 golang.org/x/net@v0.0.0-20181017193950-04a2e542c03f golang.org/x/text@v0.3.0 go melody github.com/olahol/melody@v1.1.1 github.com/gorilla/websocket@v1.5.0 go scany github.com/georgysavva/scany/v2@v2.0.0 github.com/jackc/pgx/v5@v5.0.0 golang.org/x/crypto@v0.0.0-20220829220503-c86fa9a7ed90 golang.org/x/sys@v0.0.0-20210823070655-63515b42dcdf golang.org/x/text@v0.3.7 diff --git a/test/projectgraph/receivers_test.go b/test/projectgraph/receivers_test.go index 47be09f3..64ed7bb0 100644 --- a/test/projectgraph/receivers_test.go +++ b/test/projectgraph/receivers_test.go @@ -346,7 +346,7 @@ var rustReceiverRows = []receiverRow{ name: "parameter of a use of an inline module", source: "struct Local;\nimpl Local {\n fn inspect(&self) {}\n}\n\nmod inner {\n use dep::Thing as Local;\n pub fn go(t: Local) {\n t.inspect();\n }\n}\n\nfn run() {\n inner::go(dep::new_thing());\n}", target: "dep//Thing//inspect", - want: "uncertain/unknown-receiver", + want: "found", }, { name: "parameter of a type alias of the outer function", @@ -554,11 +554,7 @@ func pythonReceiverProject(source string) map[string]string { // receiverAnswer links a project of the files with the dependency code of // the language and answers the target of the row. func receiverAnswer(t *testing.T, languages []core.Language, language core.LanguageCode, files map[string]string, row receiverRow) string { - dir := t.TempDir() - for p, text := range files { - require.NoError(t, os.MkdirAll(filepath.Dir(filepath.Join(dir, p)), 0o755)) - require.NoError(t, os.WriteFile(filepath.Join(dir, p), []byte(text), 0o644)) - } + dir := writeFiles(t, files) cfg := codefs.LocalFileSystemConfig{AppDirectories: []string{dir}, ImportUnits: map[string]string{}} units := map[string]iofs.FS{} if !row.noDeps { diff --git a/test/projectgraph/version_test.go b/test/projectgraph/version_test.go index b65348dc..c19e73b5 100644 --- a/test/projectgraph/version_test.go +++ b/test/projectgraph/version_test.go @@ -34,6 +34,7 @@ var graphHashes = map[string]string{ "15/17": "d823ce8ba221c534ab062f7e48abfe91d1c90d50b2a2fdb00d41183dc0e9da09", "16/18": "bb92620bf9903e8d19b52b62198a0bfd69d67856f9db226112b2cedf537b312b", "16/19": "51ba3e925c628602b3a53c1a6e68b379022a410bb5b749062b3045fef082ac8f", + "17/20": "598d919aebd4ef876017f8be47f6412465e22bc63848f76b35b6225882be47a6", } // resultHashes records the hash of the reach results of every case for @@ -52,6 +53,7 @@ var resultHashes = map[string]string{ "15/17/4": "1b32d7c1dbb0a4637853eb7a00b0db91a0a4e1a31f221b37ed0d0654a66ed13e", "16/18/5": "e0c6093df3a85353ee15c8a90ef7c2a441f23348ce80c9d49793c256bddeffc5", "16/19/5": "a935650f8e4d01c0abdceeefb3332bf779927693a1c48b28263da5365db752cd", + "17/20/6": "0a7c648fcbfbb282c6c13f29dee62920f4123290ad2e2aef2738c8a756a9e343", } // summaryHashes records the hash of the golden summaries of the cases for @@ -71,6 +73,7 @@ var summaryHashes = map[string]string{ "15/17/2": "00a6bd5871f70459a617079f431939ef7c92e4b3f360013c1dedd017fe1146be", "16/18/3": "694efb5f72075356359031d449d7b4ecbdca2ddd5099dacbcd2adad745ac6e19", "16/19/3": "13c72bf9eb60fc0a38bc600906fc02028d5cb60cb2aefbec0f0721779c429d80", + "17/20/3": "e5d34cb3bb13feed1a4f29725bc572a00796fea07ce96890ce59f985bdf243bd", } func TestGraphHashFollowsVersion(t *testing.T) {