Merge pull request #32 from grafana/31-support-import-path-of-arbitrary-depth

support import path of arbitrary depth

Author: szkiba

dependencies.go

@@ -11,7 +11,7 @@ import (
 
 //nolint:gochecknoglobals
 var (
-	srcName       = `(?P<name>k6|k6/x/[0-9a-zA-Z_-]+|(@[a-zA-Z0-9-_]+/)?xk6-([a-zA-Z0-9-_]+)((/[a-zA-Z0-9-_]+)*))`
+	srcName       = `(?P<name>k6|k6/x/[/0-9a-zA-Z_-]+|(@[a-zA-Z0-9-_]+/)?xk6-([a-zA-Z0-9-_]+)((/[a-zA-Z0-9-_]+)*))`
 	srcConstraint = `[vxX*|,&\^0-9.+-><=, ~]+`
 
 	reName = regexp.MustCompile(srcName)

dependencies_test.go

@@ -157,6 +157,7 @@ func Test_Dependencies_UnmarshalJS(t *testing.T) {
 "use k6 with k6/x/foo>v0.1.0";
 import "k6/x/dumber";
 import hello from "k6/x/hello"
+import bar from "k6/x/foo/bar";
 let dumb = require("k6/x/dumb");
 `))
 	require.NoError(t, err)
@@ -167,6 +168,7 @@ let dumb = require("k6/x/dumb");
 	require.Equal(t, "k6/x/dumb*", deps["k6/x/dumb"].String())
 	require.Equal(t, "k6/x/dumber*", deps["k6/x/dumber"].String())
 	require.Equal(t, "k6/x/hello*", deps["k6/x/hello"].String())
+	require.Equal(t, "k6/x/foo/bar*", deps["k6/x/foo/bar"].String())
 
 	err = deps.UnmarshalJS([]byte(`"use k6 with k6/x/foo>v0.1.0";
 "use k6 with k6/x/dumb>v0.4.0";

examples/combined.js

@@ -1,13 +1,13 @@
 "use k6 = 0.52";
 "use k6 with k6/x/faker >= 0.3.0";
-"use k6 with k6/x/sql >= 0.4.0";
+"use k6 with k6/x/sql >= 1.0.0";
 
 import faker from "./faker.js";
-import sqlite from "./sqlite.js";
+import sql from "./sql.js";
 
-export { setup, teardown } from "./sqlite.js";
+export { setup, teardown } from "./sql.js";
 
 export default () => {
   faker();
-  sqlite();
+  sql();
 };

examples/sql.js

@@ -0,0 +1,25 @@
+// source: https://github.com/grafana/xk6-sql/blob/v0.4.0/examples/sqlite3_test.js
+import sql from "k6/x/sql";
+import driver from "k6/x/sql/driver/ramsql";
+
+const db = sql.open(driver);
+
+export function setup() {
+  db.exec(`CREATE TABLE IF NOT EXISTS namevalues (
+           id integer PRIMARY KEY AUTOINCREMENT,
+           name varchar NOT NULL,
+           value varchar);`);
+}
+
+export function teardown() {
+  db.close();
+}
+
+export default function () {
+  db.exec("INSERT INTO namevalues (name, value) VALUES('plugin-name', 'k6-plugin-sql');");
+
+  let results = db.query("SELECT * FROM namevalues WHERE name = $1;", "plugin-name");
+  for (const row of results) {
+    console.log(`name: ${row.name}, value: ${row.value}`);
+  }
+}

examples/sqlite.js

@@ -0,0 +1,6 @@
+k6deps `v0.1.6` is here 🎉!
+
+This release includes:
+
+- Support import path of arbitrary depth (deeper than three levels) (eg `k6/x/foo/bar`). Drivers of the `xk6-sql` extension use 5-level deep imports (eg `k6/x/sql/driver/ramsql`)
+