Global rename to thema

grafana · Dec 15, 2021 · 585be90 · 585be90
1 parent 4594147
commit 585be90
Show file tree

Hide file tree

Showing 25 changed files with 138 additions and 121 deletions.
diff --git a/crd/crd.cue b/crd/crd.cue
@@ -3,17 +3,17 @@ package crd
 import (
     "list"
     "strings"
-    "github.com/grafana/scuemata"
+    "github.com/grafana/thema"
 )
 
 // CRD transforms a lineage into a Kubernetes custom resource definition, or a series thereof.
 #CRD: {
     _sv: [<len(lin.Seqs), <len(lin.Seqs[_sv[0]].schemas)]
     served: [..._sv]
     storage: _sv
-    lin: scuemata.#Lineage
+    lin: thema.#Lineage
 
-    // Additional metadata necessary to convert a scuemata lineage into a
+    // Additional metadata necessary to convert a thema lineage into a
     // Kubernetes Custom Resource Definition (CRD).
     crdspec = spec: {
 		// scope indicates whether the defined custom resource is cluster-
@@ -35,7 +35,7 @@ import (
             // kind is the serialized kind of the resource. It is normally
             // CamelCase and singular. Custom resource instances will use
             // this value as the `kind` attribute in API calls.
-            // TODO default this to scuemata name
+            // TODO default this to thema name
             kind: string | *lin.Name
 
             // listKind is the serialized kind of the list for this resource.
@@ -52,7 +52,7 @@ import (
             // singular is the singular name of the resource. It must be all
             // lowercase.
             singular: string | *strings.ToLower(kind)
-            // TODO https://github.com/cue-lang/cue/issues/943
+            // TODO(must) https://github.com/cue-lang/cue/issues/943
             // singular: must(singular == strings.ToLower(singular), "singular form must be all lower case")
         }
         // Deprecated upstream, so omitted
@@ -61,7 +61,7 @@ import (
 		// conversion defines conversion settings for the CRD.
         conversion?: {
             // TODO for now, only allow this and not webhook, because what we
-            // really want to do is swap scuemata translation logic in for
+            // really want to do is swap thema translation logic in for
             // Scheme
             strategy: "None"
         }

diff --git a/cue.mod/module.cue b/cue.mod/module.cue
@@ -1 +1 @@
-module: "github.com/grafana/scuemata"
+module: "github.com/grafana/thema"
diff --git a/docs/authoring/authoring.md b/docs/authoring/authoring.md
diff --git a/embed.go b/embed.go
@@ -1,21 +1,21 @@
-package scuemata
+package thema
 
 import (
 	"embed"
 )
 
-// CueFS contains the raw .cue files that comprise the core scuemata system,
+// CueFS contains the raw .cue files that comprise the core thema system,
 // making them available directly in Go.
 //
 // This virtual filesystem is relied on by the Go functions exported by this
 // library, effectively co-versioning the Go logic with the CUE logic. It
 // is exported such that other Go packages have the unfettered capability to
-// create their own scuemata-based systems.
+// create their own thema-based systems.
 //
 //go:embed *.cue
 var CueFS embed.FS
 
-// CueJointFS contains the raw scuemata .cue files, as well as the cue.mod
+// CueJointFS contains the raw thema .cue files, as well as the cue.mod
 // directory.
 //
 //go:embed *.cue cue.mod

diff --git a/exemplars/constraint.cue b/exemplars/constraint.cue
@@ -1,13 +1,13 @@
 package exemplars
 
-import "github.com/grafana/scuemata"
+import "github.com/grafana/thema"
 
 _#Exemplar: {
-    l: scuemata.#Lineage
+    l: thema.#Lineage
     description: string
     // tt: [string]: {
     //     r: l.JoinSchema
-    //     to: scuemata.#SearchCriteria
+    //     to: thema.#SearchCriteria
     //     expect: {
     //         to: l.JoinSchema
     //     }

diff --git a/exemplars/defaultchange.cue b/exemplars/defaultchange.cue
@@ -1,10 +1,10 @@
 package exemplars
 
-import "github.com/grafana/scuemata"
+import "github.com/grafana/thema"
 
 defaultchange: {
     description: "The default value for a field is changed, entailing a new sequence."
-    l: scuemata.#Lineage & {
+    l: thema.#Lineage & {
         Seqs: [
             {
                 schemas: [
@@ -36,7 +36,7 @@ defaultchange: {
                     lacunae: [
                         // FIXME really feels like these lacunae should be able to be autogenerated, at least for simple cases?
                         if from.aunion == "foo" {
-                            scuemata.#Lacuna & {
+                            thema.#Lacuna & {
                                 sourceFields: [{
                                     path: "aunion"
                                     value: from.aunion
@@ -47,7 +47,7 @@ defaultchange: {
                                 }]
                             }
                             message: "aunion was the source default, \"foo\", and was changed to the target default, \"bar\""
-                            type: scuemata.#LacunaTypes.ChangedDefault
+                            type: thema.#LacunaTypes.ChangedDefault
                         }
                     ]
                 }
@@ -65,7 +65,7 @@ defaultchange: {
                     }
                     lacunae: [
                         if from.aunion == "foo" {
-                            scuemata.#Lacuna & {
+                            thema.#Lacuna & {
                                 sourceFields: [{
                                     path: "aunion"
                                     value: from.aunion
@@ -76,7 +76,7 @@ defaultchange: {
                                 }]
                             }
                             message: "aunion was the source default, \"bar\", and was changed to the target default, \"foo\""
-                            type: scuemata.#LacunaTypes.ChangedDefault
+                            type: thema.#LacunaTypes.ChangedDefault
                         }
                     ]
                 }

diff --git a/exemplars/embed.go b/exemplars/embed.go
@@ -4,7 +4,7 @@ import (
 	"embed"
 )
 
-// CueFS contains the raw .cue files with all the scuemata exemplars.
+// CueFS contains the raw .cue files with all the thema exemplars.
 //
 //go:embed *.cue
 var CueFS embed.FS
diff --git a/exemplars/exemplars_test.go b/exemplars/exemplars_test.go
@@ -8,8 +8,8 @@ import (
 	"cuelang.org/go/cue/cuecontext"
 	"cuelang.org/go/cue/errors"
 	"cuelang.org/go/cue/load"
-	"github.com/grafana/scuemata"
-	"github.com/grafana/scuemata/internal/util"
+	"github.com/grafana/thema"
+	"github.com/grafana/thema/internal/util"
 )
 
 func TestExemplarValidity(t *testing.T) {
@@ -21,7 +21,7 @@ func TestExemplarValidity(t *testing.T) {
 	ctx := cuecontext.New()
 	cfg := &load.Config{
 		Overlay: overlay,
-		Module:  "github.com/grafana/scuemata",
+		Module:  "github.com/grafana/thema",
 		Dir:     filepath.Join(util.Prefix, "exemplars"),
 	}
 
@@ -32,7 +32,7 @@ func TestExemplarValidity(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	lib := scuemata.NewLibrary(ctx)
+	lib := thema.NewLibrary(ctx)
 	for iter.Next() {
 		lin := iter.Value().LookupPath(cue.ParsePath("l"))
 		name, _ := lin.LookupPath(cue.ParsePath("Name")).String()
@@ -42,7 +42,7 @@ func TestExemplarValidity(t *testing.T) {
 				// subsumption in cue v0.4.0 panics in all three of these cases
 				t.Skip()
 			}
-			err = scuemata.ValidateCompatibilityInvariants(lin, lib)
+			err = thema.ValidateCompatibilityInvariants(lin, lib)
 			if err != nil {
 				t.Fatal(errors.Details(err, nil))
 			}
@@ -53,7 +53,7 @@ func TestExemplarValidity(t *testing.T) {
 func exemplarOverlay() (map[string]load.Source, error) {
 	overlay := make(map[string]load.Source)
 
-	if err := util.ToOverlay(util.Prefix, scuemata.CueJointFS, overlay); err != nil {
+	if err := util.ToOverlay(util.Prefix, thema.CueJointFS, overlay); err != nil {
 		return nil, err
 	}
 

diff --git a/exemplars/expand.cue b/exemplars/expand.cue
@@ -1,10 +1,10 @@
 package exemplars
 
-import "github.com/grafana/scuemata"
+import "github.com/grafana/thema"
 
 expand: {
     description: "A few schema in a single sequence, illustrating some simple expansions permitted by backwards compatibility (subsumption) rules."
-    l: scuemata.#Lineage & {
+    l: thema.#Lineage & {
         Seqs: [
             {
                 schemas: [

diff --git a/exemplars/narrowing.cue b/exemplars/narrowing.cue
@@ -1,10 +1,10 @@
 package exemplars
 
-import "github.com/grafana/scuemata"
+import "github.com/grafana/thema"
 
 narrowing: {
     description: "Lineage that narrows a sloppily-specified boolean/string-ish type to a proper boolean over a single breaking change."
-    l: scuemata.#Lineage & {
+    l: thema.#Lineage & {
         Seqs: [
             {
                 schemas: [
@@ -35,7 +35,7 @@ narrowing: {
                     }
                     lacunae: [
                         if ((from.boolish & string) != _|_) && ((from.boolish & ("true" | "false")) == _|_) {
-                            scuemata.#Lacuna & {
+                            thema.#Lacuna & {
                                 sourceFields: [{
                                     path: "boolish"
                                     value: from.boolish
@@ -45,7 +45,7 @@ narrowing: {
                                     value: to.properbool
                                 }]
                                 message: "boolish was a string but neither \"true\" nor \"false\"; fallback to treating as false"
-                                type: scuemata.#LacunaTypes.LossyFieldMapping
+                                type: thema.#LacunaTypes.LossyFieldMapping
                             }
                         }
                     ]
@@ -56,7 +56,7 @@ narrowing: {
                     from: Seqs[1].schemas[0]
                     translated: to & rel
                     rel: {
-                        // Preserving preicse original form is a non-goal of scuemata in general.
+                        // Preserving preicse original form is a non-goal of thema in general.
                         boolish: from.properbool
                     }
                     lacunae: []

diff --git a/exemplars/rename.cue b/exemplars/rename.cue
@@ -1,10 +1,10 @@
 package exemplars
 
-import "github.com/grafana/scuemata"
+import "github.com/grafana/thema"
 
 rename: {
     description: "A field is renamed - a breaking change, necessitating a new sequence."
-    l: scuemata.#Lineage & {
+    l: thema.#Lineage & {
         Seqs: [
             {
                 schemas: [

diff --git a/exemplars/single.cue b/exemplars/single.cue
@@ -1,10 +1,10 @@
 package exemplars
 
-import "github.com/grafana/scuemata"
+import "github.com/grafana/thema"
 
 single: {
     description: "Lineage containing one sequence with a single, trivial schema."
-    l: scuemata.#Lineage & {
+    l: thema.#Lineage & {
         Seqs: [
             {
                 schemas: [

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/grafana/scuemata
+module github.com/grafana/thema
 
 go 1.16
 

diff --git a/go.sum b/go.sum
@@ -22,9 +22,11 @@ github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
+github.com/emicklei/proto v1.6.15 h1:XbpwxmuOPrdES97FrSfpyy67SSCV/wBIKXqgJzh6hNw=
 github.com/emicklei/proto v1.6.15/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -35,14 +37,17 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
@@ -56,10 +61,14 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
@@ -74,6 +83,7 @@ github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsK
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
@@ -84,8 +94,10 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
+github.com/protocolbuffers/txtpbfmt v0.0.0-20201118171849-f6a6b3f636fc h1:gSVONBi2HWMFXCa9jFdYvYk7IwW/mTLxWOF7rXS4LO0=
 github.com/protocolbuffers/txtpbfmt v0.0.0-20201118171849-f6a6b3f636fc/go.mod h1:KbKfKPy2I6ecOIGA9apfheFv14+P3RSmmQvshofQyMY=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
+github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
@@ -99,6 +111,7 @@ github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb6
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
@@ -133,6 +146,7 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -159,6 +173,7 @@ golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200612220849-54c614fe050c h1:g6oFfz6Cmw68izP3xsdud3Oxu145IPkeFzyRg58AKHM=
 golang.org/x/tools v0.0.0-20200612220849-54c614fe050c/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -170,11 +185,13 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi
 google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71 h1:Xe2gvTZUJpsvOWUnvmL/tmhVBZUmHSvLbMjRj6NUUKo=
 gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/impl.go b/impl.go
@@ -1,4 +1,4 @@
-package scuemata
+package thema
 
 import (
 	"cuelang.org/go/cue"

diff --git a/lacuna.cue b/lacuna.cue
@@ -1,4 +1,4 @@
-package scuemata
+package thema
 
 // A Lacuna represents a semantic gap in a Lens's mapping between schemas.
 //
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		module: "github.com/grafana/scuemata"
		module: "github.com/grafana/thema"