Move Error to a new libsasserrors package

To allow clients to reason (import) the errors without needing CGO.

Author: bep

libsass/libsasserrors/libsasserrors.go

@@ -0,0 +1,31 @@
+// Copyright © 2022 Bjørn Erik Pedersen <[email protected]>.
+//
+// Use of this source code is governed by an MIT-style
+// license that can be found in the LICENSE file.
+
+// Package libsasserrors holds the error types used by the libsass package.
+package libsasserrors
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// JsonToError converts a JSON string to an error.
+func JsonToError(jsonstr string) (e Error) {
+	_ = json.Unmarshal([]byte(jsonstr), &e)
+	return
+}
+
+// Error is a libsass error.
+type Error struct {
+	Status  int    `json:"status"`
+	Column  int    `json:"column"`
+	File    string `json:"file"`
+	Line    int    `json:"line"`
+	Message string `json:"message"`
+}
+
+func (e Error) Error() string {
+	return fmt.Sprintf("file %q, line %d, col %d: %s ", e.File, e.Line, e.Column, e.Message)
+}

libsass/transpiler.go

@@ -1,4 +1,4 @@
-// Copyright © 2020 Bjørn Erik Pedersen <[email protected]>.
+// Copyright © 2022 Bjørn Erik Pedersen <[email protected]>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
@@ -7,12 +7,11 @@
 package libsass
 
 import (
-	"encoding/json"
-	"fmt"
 	"os"
 	"strings"
 
 	"github.com/bep/golibsass/internal/libsass"
+	"github.com/bep/golibsass/libsass/libsasserrors"
 )
 
 type libsassTranspiler struct {
@@ -81,7 +80,7 @@ func (t libsassTranspiler) Execute(src string) (Result, error) {
 	libsass.SassCompilerExecute(compiler)
 
 	if status := libsass.SassContextGetErrorStatus(ctx); status != 0 {
-		return result, jsonToError(libsass.SassContextGetErrorJSON(ctx))
+		return result, libsasserrors.JsonToError(libsass.SassContextGetErrorJSON(ctx))
 	}
 
 	result.CSS = libsass.SassContextGetOutputString(ctx)
@@ -159,20 +158,3 @@ type SourceMapOptions struct {
 	OmitURL        bool
 	EnableEmbedded bool
 }
-
-func jsonToError(jsonstr string) (e Error) {
-	_ = json.Unmarshal([]byte(jsonstr), &e)
-	return
-}
-
-type Error struct {
-	Status  int    `json:"status"`
-	Column  int    `json:"column"`
-	File    string `json:"file"`
-	Line    int    `json:"line"`
-	Message string `json:"message"`
-}
-
-func (e Error) Error() string {
-	return fmt.Sprintf("file %q, line %d, col %d: %s ", e.File, e.Line, e.Column, e.Message)
-}

libsass/transpiler_test.go

@@ -13,6 +13,7 @@ import (
 	"sync"
 	"testing"
 
+	"github.com/bep/golibsass/libsass/libsasserrors"
 	qt "github.com/frankban/quicktest"
 )
 
@@ -85,7 +86,7 @@ func TestError(t *testing.T) {
 	_, err = transpiler.Execute("\n\ndiv { color: $blue; }")
 	c.Assert(err, qt.Not(qt.IsNil))
 
-	lerr := err.(Error)
+	lerr := err.(libsasserrors.Error)
 	c.Assert(lerr.Line, qt.Equals, 3)
 	c.Assert(lerr.Column, qt.Equals, 14)
 	c.Assert(lerr.Message, qt.Equals, `Undefined variable: "$blue".`)