diff --git a/pkg/collections/collection.go b/pkg/collections/collection.go
index 6c87ec232003b71a3873888a9f00e8513959fed4..32d67de28bfe2148e1cf8fc565e9785a06ed23af 100644
--- a/pkg/collections/collection.go
+++ b/pkg/collections/collection.go
@@ -5,7 +5,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/data"
"git.perx.ru/perxis/perxis-go/pkg/permission"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
)
// Config
diff --git a/pkg/collections/marshal.go b/pkg/collections/marshal.go
index 21c7bed0c5a8edb83780a19d31045d8b8c07f9ef..8b8e4ff3497d2e20d2d0b1c4ed74275fb11971ff 100644
--- a/pkg/collections/marshal.go
+++ b/pkg/collections/marshal.go
@@ -6,7 +6,7 @@ import (
"time"
"git.perx.ru/perxis/perxis-go/pkg/optional"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
jsoniter "github.com/json-iterator/go"
)
diff --git a/pkg/collections/marshal_test.go b/pkg/collections/marshal_test.go
index 2cc1bf52499422160d189a1e454144de39da4c95..69ba18ac63ddb1fcbf035200b4eb5354f6bfe4df 100644
--- a/pkg/collections/marshal_test.go
+++ b/pkg/collections/marshal_test.go
@@ -4,8 +4,8 @@ import (
"testing"
"git.perx.ru/perxis/perxis-go/pkg/optional"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
jsoniter "github.com/json-iterator/go"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
diff --git a/pkg/collections/middleware/access_logging_middleware.go b/pkg/collections/middleware/access_logging_middleware.go
index 3624955b5d3ef6201704932e623b4e8e00cc6192..2fd81539acbc5a06e3729800d4468596d2ece24f 100644
--- a/pkg/collections/middleware/access_logging_middleware.go
+++ b/pkg/collections/middleware/access_logging_middleware.go
@@ -12,7 +12,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
"go.uber.org/zap"
)
diff --git a/pkg/collections/middleware/caching_middleware.go b/pkg/collections/middleware/caching_middleware.go
index cb95d0d9a8772f91700f5f630fa9bb2631e51937..1551db5ae93e35eb28fa7ad7b9a787e4278c8d83 100644
--- a/pkg/collections/middleware/caching_middleware.go
+++ b/pkg/collections/middleware/caching_middleware.go
@@ -6,7 +6,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/cache"
service "git.perx.ru/perxis/perxis-go/pkg/collections"
envService "git.perx.ru/perxis/perxis-go/pkg/environments"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
)
func makeKey(spaceId, envId, collectionId string, disableSchemaIncludes bool) string {
diff --git a/pkg/collections/middleware/caching_middleware_test.go b/pkg/collections/middleware/caching_middleware_test.go
index 24646008ba32736ca45f7bcdc7e0a4845c43877d..14d6d5e37709c982af8ed971ed9260d7b272edb4 100644
--- a/pkg/collections/middleware/caching_middleware_test.go
+++ b/pkg/collections/middleware/caching_middleware_test.go
@@ -11,7 +11,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/environments"
envmocks "git.perx.ru/perxis/perxis-go/pkg/environments/mocks"
"git.perx.ru/perxis/perxis-go/pkg/errors"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
diff --git a/pkg/collections/middleware/logging_middleware.go b/pkg/collections/middleware/logging_middleware.go
index 92e2811bd2f30cd45eb0b1aa66da1d52cfbb2596..65db3a4314707331bf7e4fbca9dbe5a472cab2be 100644
--- a/pkg/collections/middleware/logging_middleware.go
+++ b/pkg/collections/middleware/logging_middleware.go
@@ -5,7 +5,7 @@ import (
"git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
logzap "git.perx.ru/perxis/perxis-go/zap"
"go.uber.org/zap"
)
diff --git a/pkg/collections/middleware/recovering_middleware.go b/pkg/collections/middleware/recovering_middleware.go
index 6f5594bcfd097d8ffa9132768f7f9538f6edf9da..11dbb42c574ac5e5928512ff6a92f6a433b9a694 100644
--- a/pkg/collections/middleware/recovering_middleware.go
+++ b/pkg/collections/middleware/recovering_middleware.go
@@ -11,7 +11,7 @@ import (
"fmt"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
"go.uber.org/zap"
)
diff --git a/pkg/collections/middleware/telemetry_middleware.go b/pkg/collections/middleware/telemetry_middleware.go
index c189a7bebaf727b818aa3f37ecb828ff89de6391..ac67472695f028a81cac5b90ba5a8ed6de4215c4 100644
--- a/pkg/collections/middleware/telemetry_middleware.go
+++ b/pkg/collections/middleware/telemetry_middleware.go
@@ -13,8 +13,8 @@ import (
oid "git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+ "git.perx.ru/perxis/perxis-go/schema"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/collections/mocks/Collections.go b/pkg/collections/mocks/Collections.go
index 9a0a67f6dba82b5e7343dba1f0cc152ce82acb6a..df5a2cad9f0d3f0ad708571caa7822dcf117ea67 100644
--- a/pkg/collections/mocks/Collections.go
+++ b/pkg/collections/mocks/Collections.go
@@ -9,7 +9,7 @@ import (
mock "github.com/stretchr/testify/mock"
- schema "git.perx.ru/perxis/perxis-go/pkg/schema"
+ schema "git.perx.ru/perxis/perxis-go/schema"
)
// Collections is an autogenerated mock type for the Collections type
diff --git a/pkg/collections/service.go b/pkg/collections/service.go
index e73133e7c5ecbf6f58d29b2f07343f05bb13d5b0..466bce007588c7198c920c31b1b5f5343715ec4c 100644
--- a/pkg/collections/service.go
+++ b/pkg/collections/service.go
@@ -3,7 +3,7 @@ package collections
import (
"context"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
)
// @microgen grpc
diff --git a/pkg/collections/transport/client.go b/pkg/collections/transport/client.go
index 2a430e6c8893236c73c7979654c282cb6094b807..7dc3d69672f3cd7d264fca964710fc586827022b 100644
--- a/pkg/collections/transport/client.go
+++ b/pkg/collections/transport/client.go
@@ -6,7 +6,7 @@ import (
"context"
collections "git.perx.ru/perxis/perxis-go/pkg/collections"
- schema "git.perx.ru/perxis/perxis-go/pkg/schema"
+ schema "git.perx.ru/perxis/perxis-go/schema"
)
func (set EndpointsSet) Create(arg0 context.Context, arg1 *collections.Collection) (res0 *collections.Collection, res1 error) {
diff --git a/pkg/collections/transport/exchanges.microgen.go b/pkg/collections/transport/exchanges.microgen.go
index 3aabcbc890d2e5691fe6167024254bba71f5fe2d..b5e215ee459803161b7691825cb3e59a38ff164b 100644
--- a/pkg/collections/transport/exchanges.microgen.go
+++ b/pkg/collections/transport/exchanges.microgen.go
@@ -4,7 +4,7 @@ package transport
import (
collections "git.perx.ru/perxis/perxis-go/pkg/collections"
- schema "git.perx.ru/perxis/perxis-go/pkg/schema"
+ schema "git.perx.ru/perxis/perxis-go/schema"
)
type (
diff --git a/pkg/collections/transport/grpc/protobuf_type_converters.microgen.go b/pkg/collections/transport/grpc/protobuf_type_converters.microgen.go
index 282f308cdb556ec92a9dcec0e4d39a1b75fd444d..226af910b761d681b82708f43caa0d862f46ee86 100644
--- a/pkg/collections/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/collections/transport/grpc/protobuf_type_converters.microgen.go
@@ -9,9 +9,9 @@ import (
service "git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/permission"
- schema "git.perx.ru/perxis/perxis-go/pkg/schema"
pb "git.perx.ru/perxis/perxis-go/proto/collections"
commonpb "git.perx.ru/perxis/perxis-go/proto/common"
+ schema "git.perx.ru/perxis/perxis-go/schema"
jsoniter "github.com/json-iterator/go"
"google.golang.org/protobuf/types/known/durationpb"
"google.golang.org/protobuf/types/known/timestamppb"
diff --git a/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go b/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go
index 7067dc51722117ddc00dd6208de6da9bd8a8e9bd..422dee1b7b3fdf3bcfe6f428a0b850937c8fb66d 100644
--- a/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go
@@ -13,13 +13,13 @@ import (
items "git.perx.ru/perxis/perxis-go/pkg/items"
locales "git.perx.ru/perxis/perxis-go/pkg/locales"
services "git.perx.ru/perxis/perxis-go/pkg/options"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
collectionspb "git.perx.ru/perxis/perxis-go/proto/collections"
"git.perx.ru/perxis/perxis-go/proto/common"
"git.perx.ru/perxis/perxis-go/proto/delivery"
environmentspb "git.perx.ru/perxis/perxis-go/proto/environments"
itemspb "git.perx.ru/perxis/perxis-go/proto/items"
localespb "git.perx.ru/perxis/perxis-go/proto/locales"
+ "git.perx.ru/perxis/perxis-go/schema"
"google.golang.org/protobuf/types/known/structpb"
"google.golang.org/protobuf/types/known/timestamppb"
)
diff --git a/pkg/extension/extension.go b/pkg/extension/extension.go
index 432078899448d7f4875991e06fba44dd17830917..901a8085b141d3220479e711ab616f142f98e40a 100644
--- a/pkg/extension/extension.go
+++ b/pkg/extension/extension.go
@@ -10,9 +10,9 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/content"
"git.perx.ru/perxis/perxis-go/pkg/errors"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
"git.perx.ru/perxis/perxis-go/pkg/setup"
pb "git.perx.ru/perxis/perxis-go/proto/extensions"
+ "git.perx.ru/perxis/perxis-go/schema"
)
const (
diff --git a/pkg/extension/extension_test.go b/pkg/extension/extension_test.go
index 1e5755e67fe17d02d6d7b7fbf239da49e402ceb0..90de7b4b434565f01e8fff8760a67e063aea5d21 100644
--- a/pkg/extension/extension_test.go
+++ b/pkg/extension/extension_test.go
@@ -8,9 +8,9 @@ import (
"go.uber.org/zap/zaptest/observer"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
"git.perx.ru/perxis/perxis-go/pkg/setup"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/extension/schema_test.go b/pkg/extension/schema_test.go
index e17e891e0368888d8797b251fbec6c2fb833615b..5c6a92023025369bf2bcb6de4a352a66e790005b 100644
--- a/pkg/extension/schema_test.go
+++ b/pkg/extension/schema_test.go
@@ -7,9 +7,9 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/references"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
- "git.perx.ru/perxis/perxis-go/pkg/schema/validate"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/validate"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/files/field.go b/pkg/files/field.go
index 7386831322a0c67852cd18e570bc3a0c5781da9f..c7ba10a7d06e87e1a4a3ba4db0926e3a60b9e938 100644
--- a/pkg/files/field.go
+++ b/pkg/files/field.go
@@ -9,8 +9,8 @@ import (
"reflect"
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
signer "git.perx.ru/perxis/perxis-go/pkg/urlsigner"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/mitchellh/mapstructure"
)
diff --git a/pkg/files/field_test.go b/pkg/files/field_test.go
index 7b6317309654c9027ca0b373b2362b7d3aad54af..cf055cfd5c4803dc3eade4723cb7048c6ea8b9b9 100644
--- a/pkg/files/field_test.go
+++ b/pkg/files/field_test.go
@@ -3,8 +3,8 @@ package files
import (
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/filter/filter.go b/pkg/filter/filter.go
index d75dc99886698a14342dc4f5ad4d9423fc26d893..d54147ea7502492ca662303b44d7aee4c3b9720e 100644
--- a/pkg/filter/filter.go
+++ b/pkg/filter/filter.go
@@ -7,9 +7,9 @@ import (
"strings"
"git.perx.ru/perxis/perxis-go/pkg/errors"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
- "git.perx.ru/perxis/perxis-go/pkg/schema/validate"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/validate"
"github.com/hashicorp/go-multierror"
"github.com/mitchellh/mapstructure"
"go.mongodb.org/mongo-driver/bson"
diff --git a/pkg/filter/filter_test.go b/pkg/filter/filter_test.go
index 7283e26a0dfebcc5159211e49c30dc29150f12db..8a00754fe5a6d9ff02d3ba8d0c0cb82811adcdad 100644
--- a/pkg/filter/filter_test.go
+++ b/pkg/filter/filter_test.go
@@ -4,8 +4,8 @@ import (
"testing"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.mongodb.org/mongo-driver/bson/primitive"
diff --git a/pkg/items/item.go b/pkg/items/item.go
index dc56fe63284be6885cf4560578df0bf77729e359..4cc3c0470e2716cab18372fc47332b1b0eb34db0 100644
--- a/pkg/items/item.go
+++ b/pkg/items/item.go
@@ -8,10 +8,10 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/data"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/locales"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
- "git.perx.ru/perxis/perxis-go/pkg/schema/localizer"
pb "git.perx.ru/perxis/perxis-go/proto/items"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/localizer"
"google.golang.org/protobuf/types/known/structpb"
"google.golang.org/protobuf/types/known/timestamppb"
)
diff --git a/pkg/items/item_test.go b/pkg/items/item_test.go
index 05baa60a3c1e8eaae9534fe9026d7456d78ab36c..2978030d01001637bd1be32ecc705f00e2040049 100644
--- a/pkg/items/item_test.go
+++ b/pkg/items/item_test.go
@@ -6,8 +6,8 @@ import (
"testing"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/items/middleware/access_logging_middleware.go b/pkg/items/middleware/access_logging_middleware.go
index 2342a6d99249f427aa0f4ad6b4220a43ba872a4f..3e5fcaa6d795039675acf0dff6a97db354a26028 100644
--- a/pkg/items/middleware/access_logging_middleware.go
+++ b/pkg/items/middleware/access_logging_middleware.go
@@ -12,7 +12,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
"go.uber.org/zap"
)
diff --git a/pkg/items/middleware/client_encode_middleware.go b/pkg/items/middleware/client_encode_middleware.go
index 873a0e97c7690bcf51a042528787c57860d6163f..afc1cba2638990eca497d6854be2f491d89d5954 100644
--- a/pkg/items/middleware/client_encode_middleware.go
+++ b/pkg/items/middleware/client_encode_middleware.go
@@ -6,7 +6,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
)
// ClientEncodeMiddleware выполняет операции encode/decode для передаваемых данных
diff --git a/pkg/items/middleware/logging_middleware.go b/pkg/items/middleware/logging_middleware.go
index 1178719ee2ad0190e12316165b2536de67f1324e..73e449171b5c651f1a33d2b9e59aee594540dc80 100644
--- a/pkg/items/middleware/logging_middleware.go
+++ b/pkg/items/middleware/logging_middleware.go
@@ -5,7 +5,7 @@ import (
"git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
logzap "git.perx.ru/perxis/perxis-go/zap"
"go.uber.org/zap"
)
diff --git a/pkg/items/middleware/recovering_middleware.go b/pkg/items/middleware/recovering_middleware.go
index d719dd114010f4a28658a0508030042fe80c7d5e..d5792908b0b56266c98f9e6675f9e8c23bf7c68b 100644
--- a/pkg/items/middleware/recovering_middleware.go
+++ b/pkg/items/middleware/recovering_middleware.go
@@ -11,7 +11,7 @@ import (
"fmt"
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
"go.uber.org/zap"
)
diff --git a/pkg/items/middleware/telemetry_middleware.go b/pkg/items/middleware/telemetry_middleware.go
index da626aa53ea846ce5747bd0deded09d300d48d95..0fdbb00116407fe429e0cff112a58f4d6025852b 100644
--- a/pkg/items/middleware/telemetry_middleware.go
+++ b/pkg/items/middleware/telemetry_middleware.go
@@ -13,8 +13,8 @@ import (
oid "git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+ "git.perx.ru/perxis/perxis-go/schema"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/items/mocks/Items.go b/pkg/items/mocks/Items.go
index e134822e2869693fa3801affac8660eb357cd70c..af3b5703a95ac42bebc37e4d073d9c32a26f14d7 100644
--- a/pkg/items/mocks/Items.go
+++ b/pkg/items/mocks/Items.go
@@ -8,7 +8,7 @@ import (
items "git.perx.ru/perxis/perxis-go/pkg/items"
mock "github.com/stretchr/testify/mock"
- schema "git.perx.ru/perxis/perxis-go/pkg/schema"
+ schema "git.perx.ru/perxis/perxis-go/schema"
)
// Items is an autogenerated mock type for the Items type
diff --git a/pkg/items/mocks/PreSaver.go b/pkg/items/mocks/PreSaver.go
index 3acc32732fcea3df459a5234fb5c952e823edfaa..7d33d89757e9f9900304a295396cfd82b7a004f4 100644
--- a/pkg/items/mocks/PreSaver.go
+++ b/pkg/items/mocks/PreSaver.go
@@ -6,7 +6,7 @@ import (
context "context"
items "git.perx.ru/perxis/perxis-go/pkg/items"
- field "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ field "git.perx.ru/perxis/perxis-go/schema/field"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/items/mocks/ProcessDataFunc.go b/pkg/items/mocks/ProcessDataFunc.go
index 7689da0df40591ba68ca8a6eb3a160d475a81c90..57c8867973ad0b3ea18beed5168e36188c5522fc 100644
--- a/pkg/items/mocks/ProcessDataFunc.go
+++ b/pkg/items/mocks/ProcessDataFunc.go
@@ -7,7 +7,7 @@ import (
mock "github.com/stretchr/testify/mock"
- schema "git.perx.ru/perxis/perxis-go/pkg/schema"
+ schema "git.perx.ru/perxis/perxis-go/schema"
)
// ProcessDataFunc is an autogenerated mock type for the ProcessDataFunc type
diff --git a/pkg/items/service.go b/pkg/items/service.go
index 1f4f2867ebfc78ef5bc32bc68c4cd9371acd84bb..39822dc152367319331b8abbdb77b0fb61543007 100644
--- a/pkg/items/service.go
+++ b/pkg/items/service.go
@@ -6,8 +6,8 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/filter"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
// @microgen grpc
diff --git a/pkg/items/transport/client.go b/pkg/items/transport/client.go
index fd5de3f21b7ad9ec0bb1eed5f0a908216c9531d7..068b214ddc17e7962e9b77c864ace0b0451a97e5 100644
--- a/pkg/items/transport/client.go
+++ b/pkg/items/transport/client.go
@@ -7,7 +7,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
"github.com/hashicorp/go-multierror"
"google.golang.org/grpc/status"
)
diff --git a/pkg/items/transport/exchanges.microgen.go b/pkg/items/transport/exchanges.microgen.go
index be18dc59805565756e6736f60895e81bc186e1d6..ef5024c709d62a51f948feee52a393913189473c 100644
--- a/pkg/items/transport/exchanges.microgen.go
+++ b/pkg/items/transport/exchanges.microgen.go
@@ -4,7 +4,7 @@ package transport
import (
items "git.perx.ru/perxis/perxis-go/pkg/items"
- schema "git.perx.ru/perxis/perxis-go/pkg/schema"
+ schema "git.perx.ru/perxis/perxis-go/schema"
)
type (
diff --git a/pkg/items/transport/grpc/protobuf_type_converters.microgen.go b/pkg/items/transport/grpc/protobuf_type_converters.microgen.go
index 1aba486580e9f94882b29d254b1fffab39c8270c..c3d62c6c5ff98653f24e3ba237f118a7a6c37a1e 100644
--- a/pkg/items/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/items/transport/grpc/protobuf_type_converters.microgen.go
@@ -11,9 +11,9 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/filter"
service "git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/options"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
pbcommon "git.perx.ru/perxis/perxis-go/proto/common"
pb "git.perx.ru/perxis/perxis-go/proto/items"
+ "git.perx.ru/perxis/perxis-go/schema"
jsoniter "github.com/json-iterator/go"
"google.golang.org/protobuf/types/known/structpb"
)
diff --git a/pkg/references/field.go b/pkg/references/field.go
index f80e7b5a564efe81df2969fb35f14d69fd23a1c8..0ffaa093f8018ca156a85f586249cd2687e2d7fb 100644
--- a/pkg/references/field.go
+++ b/pkg/references/field.go
@@ -8,7 +8,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/data"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
const ReferenceTypeName = "reference"
diff --git a/pkg/references/field_test.go b/pkg/references/field_test.go
index ac9d5c03db107ed8f284cab3c9205afe95f1502b..592476f0a3daceec7d2644895d19974b962e4b8a 100644
--- a/pkg/references/field_test.go
+++ b/pkg/references/field_test.go
@@ -8,9 +8,9 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/items/mocks"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
- "git.perx.ru/perxis/perxis-go/pkg/schema/validate"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/validate"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/schemaloader/loader.go b/pkg/schemaloader/loader.go
index e27baf4ea8b509adff88f7b9c5e99a48f15960b7..ebf6994f4932eaa23bc98b69ce3f4fc864e0ec35 100644
--- a/pkg/schemaloader/loader.go
+++ b/pkg/schemaloader/loader.go
@@ -7,7 +7,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/errors"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
// NewLoader возвращает новый загрузчик схем из коллекций
diff --git a/pkg/setup/collection_test.go b/pkg/setup/collection_test.go
index f1d9e4da1182938249192f8ef410ceecc81c743a..fd5141a749b7777ccef4cd0f5bd973ec787de4c8 100644
--- a/pkg/setup/collection_test.go
+++ b/pkg/setup/collection_test.go
@@ -12,8 +12,8 @@ import (
"github.com/stretchr/testify/mock"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/setup/setup_test.go b/pkg/setup/setup_test.go
index ff73b745deb0fcec807fa0c0f28b2ba5a0dd7258..8caab7ae906cfa60857b69befb773b5e5a98a92c 100644
--- a/pkg/setup/setup_test.go
+++ b/pkg/setup/setup_test.go
@@ -22,7 +22,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/content"
"git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/roles"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
"go.uber.org/zap/zaptest"
)
diff --git a/pkg/schema/field/array.go b/schema/field/array.go
similarity index 100%
rename from pkg/schema/field/array.go
rename to schema/field/array.go
diff --git a/pkg/schema/field/array_test.go b/schema/field/array_test.go
similarity index 100%
rename from pkg/schema/field/array_test.go
rename to schema/field/array_test.go
diff --git a/pkg/schema/field/boolean.go b/schema/field/boolean.go
similarity index 100%
rename from pkg/schema/field/boolean.go
rename to schema/field/boolean.go
diff --git a/pkg/schema/field/boolean_test.go b/schema/field/boolean_test.go
similarity index 100%
rename from pkg/schema/field/boolean_test.go
rename to schema/field/boolean_test.go
diff --git a/pkg/schema/field/encode.go b/schema/field/encode.go
similarity index 100%
rename from pkg/schema/field/encode.go
rename to schema/field/encode.go
diff --git a/pkg/schema/field/errors.go b/schema/field/errors.go
similarity index 100%
rename from pkg/schema/field/errors.go
rename to schema/field/errors.go
diff --git a/pkg/schema/field/evaluate.go b/schema/field/evaluate.go
similarity index 100%
rename from pkg/schema/field/evaluate.go
rename to schema/field/evaluate.go
diff --git a/pkg/schema/field/field.go b/schema/field/field.go
similarity index 100%
rename from pkg/schema/field/field.go
rename to schema/field/field.go
diff --git a/pkg/schema/field/field_json.go b/schema/field/field_json.go
similarity index 100%
rename from pkg/schema/field/field_json.go
rename to schema/field/field_json.go
diff --git a/pkg/schema/field/field_test.go b/schema/field/field_test.go
similarity index 100%
rename from pkg/schema/field/field_test.go
rename to schema/field/field_test.go
diff --git a/pkg/schema/field/init.go b/schema/field/init.go
similarity index 100%
rename from pkg/schema/field/init.go
rename to schema/field/init.go
diff --git a/pkg/schema/field/loader.go b/schema/field/loader.go
similarity index 100%
rename from pkg/schema/field/loader.go
rename to schema/field/loader.go
diff --git a/pkg/schema/field/location.go b/schema/field/location.go
similarity index 100%
rename from pkg/schema/field/location.go
rename to schema/field/location.go
diff --git a/pkg/schema/field/location_test.go b/schema/field/location_test.go
similarity index 100%
rename from pkg/schema/field/location_test.go
rename to schema/field/location_test.go
diff --git a/pkg/schema/field/number.go b/schema/field/number.go
similarity index 100%
rename from pkg/schema/field/number.go
rename to schema/field/number.go
diff --git a/pkg/schema/field/number_test.go b/schema/field/number_test.go
similarity index 100%
rename from pkg/schema/field/number_test.go
rename to schema/field/number_test.go
diff --git a/pkg/schema/field/object.go b/schema/field/object.go
similarity index 100%
rename from pkg/schema/field/object.go
rename to schema/field/object.go
diff --git a/pkg/schema/field/object_test.go b/schema/field/object_test.go
similarity index 100%
rename from pkg/schema/field/object_test.go
rename to schema/field/object_test.go
diff --git a/pkg/schema/field/options.go b/schema/field/options.go
similarity index 100%
rename from pkg/schema/field/options.go
rename to schema/field/options.go
diff --git a/pkg/schema/field/primary_key.go b/schema/field/primary_key.go
similarity index 100%
rename from pkg/schema/field/primary_key.go
rename to schema/field/primary_key.go
diff --git a/pkg/schema/field/primary_key_test.go b/schema/field/primary_key_test.go
similarity index 100%
rename from pkg/schema/field/primary_key_test.go
rename to schema/field/primary_key_test.go
diff --git a/pkg/schema/field/string.go b/schema/field/string.go
similarity index 100%
rename from pkg/schema/field/string.go
rename to schema/field/string.go
diff --git a/pkg/schema/field/string_test.go b/schema/field/string_test.go
similarity index 100%
rename from pkg/schema/field/string_test.go
rename to schema/field/string_test.go
diff --git a/pkg/schema/field/time.go b/schema/field/time.go
similarity index 100%
rename from pkg/schema/field/time.go
rename to schema/field/time.go
diff --git a/pkg/schema/field/time_test.go b/schema/field/time_test.go
similarity index 100%
rename from pkg/schema/field/time_test.go
rename to schema/field/time_test.go
diff --git a/pkg/schema/field/timestamp.go b/schema/field/timestamp.go
similarity index 100%
rename from pkg/schema/field/timestamp.go
rename to schema/field/timestamp.go
diff --git a/pkg/schema/field/timestamp_test.go b/schema/field/timestamp_test.go
similarity index 100%
rename from pkg/schema/field/timestamp_test.go
rename to schema/field/timestamp_test.go
diff --git a/pkg/schema/field/type.go b/schema/field/type.go
similarity index 100%
rename from pkg/schema/field/type.go
rename to schema/field/type.go
diff --git a/pkg/schema/field/unknown.go b/schema/field/unknown.go
similarity index 100%
rename from pkg/schema/field/unknown.go
rename to schema/field/unknown.go
diff --git a/pkg/schema/field/walk.go b/schema/field/walk.go
similarity index 100%
rename from pkg/schema/field/walk.go
rename to schema/field/walk.go
diff --git a/pkg/schema/loader.go b/schema/loader.go
similarity index 88%
rename from pkg/schema/loader.go
rename to schema/loader.go
index 5a646e2398eec49bdd1b8be135f9b9a54952a113..b1cd3b72850223935a52094297f2656906acbaf2 100644
--- a/pkg/schema/loader.go
+++ b/schema/loader.go
@@ -3,7 +3,7 @@ package schema
import (
"context"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
var defaultLoader field.Loader
diff --git a/pkg/schema/localizer/localizer.go b/schema/localizer/localizer.go
similarity index 97%
rename from pkg/schema/localizer/localizer.go
rename to schema/localizer/localizer.go
index 4cc99d6075447c3eefe249f0b2963dca436c6e4f..a93eb824736c66e4ebc56f302daeb0e48472a3e2 100644
--- a/pkg/schema/localizer/localizer.go
+++ b/schema/localizer/localizer.go
@@ -6,9 +6,9 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/locales"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
- "git.perx.ru/perxis/perxis-go/pkg/schema/walk"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/walk"
)
var (
diff --git a/pkg/schema/localizer/localizer_test.go b/schema/localizer/localizer_test.go
similarity index 99%
rename from pkg/schema/localizer/localizer_test.go
rename to schema/localizer/localizer_test.go
index ab6b277cdcad36a1ffdd217f1ec198a2bf958f9f..bddca64ea85013e66d7c1b60314f7071722e4650 100644
--- a/pkg/schema/localizer/localizer_test.go
+++ b/schema/localizer/localizer_test.go
@@ -4,8 +4,8 @@ import (
"testing"
"git.perx.ru/perxis/perxis-go/pkg/locales"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/schema/modify/default.go b/schema/modify/default.go
similarity index 94%
rename from pkg/schema/modify/default.go
rename to schema/modify/default.go
index 637a0ff86021b61a59621a6aea7f63d89a40db64..bc9ab0701865acfbd43e2fbbc202e72cce689ba4 100644
--- a/pkg/schema/modify/default.go
+++ b/schema/modify/default.go
@@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
type defaultValue struct {
diff --git a/pkg/schema/modify/default_test.go b/schema/modify/default_test.go
similarity index 97%
rename from pkg/schema/modify/default_test.go
rename to schema/modify/default_test.go
index 6ea9d11047c13434553ae0ee7776a49ab0ffaf44..5b0743c2e4f0a33610bb5cf9648533c224a464c9 100644
--- a/pkg/schema/modify/default_test.go
+++ b/schema/modify/default_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/schema/modify/modify.go b/schema/modify/modify.go
similarity index 97%
rename from pkg/schema/modify/modify.go
rename to schema/modify/modify.go
index 191a428c4efac916511dd37481d7e1bac00a87bc..82adf7cf7df6dd5b752c004625e93b798b48aab2 100644
--- a/pkg/schema/modify/modify.go
+++ b/schema/modify/modify.go
@@ -6,7 +6,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/expr"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
const ModifierPriority = 1000
diff --git a/pkg/schema/modify/string.go b/schema/modify/string.go
similarity index 91%
rename from pkg/schema/modify/string.go
rename to schema/modify/string.go
index 2f0ecc6f24e114f89d97b5e0d54251da68c4aebf..054d181184888bf662d59ce314de075bd7936cae 100644
--- a/pkg/schema/modify/string.go
+++ b/schema/modify/string.go
@@ -6,7 +6,7 @@ import (
"reflect"
"strings"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
type trimSpace bool
diff --git a/pkg/schema/modify/string_test.go b/schema/modify/string_test.go
similarity index 98%
rename from pkg/schema/modify/string_test.go
rename to schema/modify/string_test.go
index 2f6451266aa08612718321d1b85d4341f280ee74..28e613d199501df450581209823cf2425bbb2c1b 100644
--- a/pkg/schema/modify/string_test.go
+++ b/schema/modify/string_test.go
@@ -5,7 +5,7 @@ import (
"reflect"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/schema/modify/value.go b/schema/modify/value.go
similarity index 94%
rename from pkg/schema/modify/value.go
rename to schema/modify/value.go
index 1f87c80387c802eaf7fb7e3fec221ea263092050..4547a8cac08a709b8346496e5105135a84fdf9ac 100644
--- a/pkg/schema/modify/value.go
+++ b/schema/modify/value.go
@@ -6,7 +6,7 @@ import (
"reflect"
"git.perx.ru/perxis/perxis-go/pkg/expr"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/pkg/errors"
)
diff --git a/pkg/schema/modify/value_test.go b/schema/modify/value_test.go
similarity index 97%
rename from pkg/schema/modify/value_test.go
rename to schema/modify/value_test.go
index eb3b9a99f6d4df61f738a993c35b61be2ea865eb..73111d41f79d3f5ae10f412ac0cc33c19e8529da 100644
--- a/pkg/schema/modify/value_test.go
+++ b/schema/modify/value_test.go
@@ -5,7 +5,7 @@ import (
"reflect"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
func TestValue(t *testing.T) {
diff --git a/pkg/schema/schema.go b/schema/schema.go
similarity index 97%
rename from pkg/schema/schema.go
rename to schema/schema.go
index 7b337f8ab68f732fb3ab2ac804fe89e082c58c6a..d939ecce471cb59b044517eb6271e4961a625a05 100644
--- a/pkg/schema/schema.go
+++ b/schema/schema.go
@@ -6,9 +6,9 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/expr"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
- "git.perx.ru/perxis/perxis-go/pkg/schema/modify"
- "git.perx.ru/perxis/perxis-go/pkg/schema/validate"
+ "git.perx.ru/perxis/perxis-go/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/modify"
+ "git.perx.ru/perxis/perxis-go/schema/validate"
)
type Schema struct {
diff --git a/pkg/schema/schema_json.go b/schema/schema_json.go
similarity index 100%
rename from pkg/schema/schema_json.go
rename to schema/schema_json.go
diff --git a/pkg/schema/schema_json_test.go b/schema/schema_json_test.go
similarity index 96%
rename from pkg/schema/schema_json_test.go
rename to schema/schema_json_test.go
index 31b475168e9e0179328295044a7201517212d4ec..e345de5f2ebaa3511c145e4f0e229a1c1fb43455 100644
--- a/pkg/schema/schema_json_test.go
+++ b/schema/schema_json_test.go
@@ -3,7 +3,7 @@ package schema
import (
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/schema/schema_test.go b/schema/schema_test.go
similarity index 85%
rename from pkg/schema/schema_test.go
rename to schema/schema_test.go
index dbedf48f9667c348c0898b73a3d308312aede6c6..6dd85d2b5b36fe8fc31b8f28cac67beaddcf924d 100644
--- a/pkg/schema/schema_test.go
+++ b/schema/schema_test.go
@@ -3,7 +3,7 @@ package schema
import (
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/schema/test/object_test.go b/schema/test/object_test.go
similarity index 99%
rename from pkg/schema/test/object_test.go
rename to schema/test/object_test.go
index 8bf3f82022e8501932e6474a985bcfc9f195e693..dc1845dabbba4a5bf0ab952b5e5d9147614f304d 100644
--- a/pkg/schema/test/object_test.go
+++ b/schema/test/object_test.go
@@ -8,10 +8,10 @@ import (
"time"
"git.perx.ru/perxis/perxis-go/pkg/data"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
- "git.perx.ru/perxis/perxis-go/pkg/schema/modify"
- "git.perx.ru/perxis/perxis-go/pkg/schema/validate"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/modify"
+ "git.perx.ru/perxis/perxis-go/schema/validate"
"github.com/hashicorp/go-multierror"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
diff --git a/pkg/schema/validate/array.go b/schema/validate/array.go
similarity index 95%
rename from pkg/schema/validate/array.go
rename to schema/validate/array.go
index 09e17e289cdfeca4cbe743271b77300a4cb7a0d8..239a78943cd8545a87fcea58b1774e2048c729fd 100644
--- a/pkg/schema/validate/array.go
+++ b/schema/validate/array.go
@@ -5,7 +5,7 @@ import (
"fmt"
"reflect"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
type maxItems int
diff --git a/pkg/schema/validate/array_test.go b/schema/validate/array_test.go
similarity index 98%
rename from pkg/schema/validate/array_test.go
rename to schema/validate/array_test.go
index ec9e9d818d5b86d7fe9e8647d862e73f44232c65..189c51016eb04f98e6b53fb0692e30aa5b73b7bc 100644
--- a/pkg/schema/validate/array_test.go
+++ b/schema/validate/array_test.go
@@ -4,7 +4,7 @@ import (
"context"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/schema/validate/enum.go b/schema/validate/enum.go
similarity index 96%
rename from pkg/schema/validate/enum.go
rename to schema/validate/enum.go
index 8df38c6d68f579f468f0f088170368a31b8f3c80..3da6f214a0552d49c78fd6fbbd670277b5bef6eb 100644
--- a/pkg/schema/validate/enum.go
+++ b/schema/validate/enum.go
@@ -4,7 +4,7 @@ import (
"context"
"fmt"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/pkg/errors"
)
diff --git a/pkg/schema/validate/enum_test.go b/schema/validate/enum_test.go
similarity index 97%
rename from pkg/schema/validate/enum_test.go
rename to schema/validate/enum_test.go
index a4c301e190dd951da7f0fb3b3c2a2ed014277028..bd2b470d44957fce7228064d70329f47ed11b564 100644
--- a/pkg/schema/validate/enum_test.go
+++ b/schema/validate/enum_test.go
@@ -4,7 +4,7 @@ import (
"context"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/schema/validate/number.go b/schema/validate/number.go
similarity index 98%
rename from pkg/schema/validate/number.go
rename to schema/validate/number.go
index 81ab150b21d0af3a5e6cc91dac664c3a479a9f11..296775bc36095f7f030aa6987c924b37da51673b 100644
--- a/pkg/schema/validate/number.go
+++ b/schema/validate/number.go
@@ -7,7 +7,7 @@ import (
"reflect"
"strconv"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
type max float64
diff --git a/pkg/schema/validate/number_test.go b/schema/validate/number_test.go
similarity index 99%
rename from pkg/schema/validate/number_test.go
rename to schema/validate/number_test.go
index 08f69401807c2cb6da3f403ee20bcbef51c06114..898859ef3267a693cb3a6ad7126e49488d3ae75b 100644
--- a/pkg/schema/validate/number_test.go
+++ b/schema/validate/number_test.go
@@ -4,7 +4,7 @@ import (
"context"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/schema/validate/readonly.go b/schema/validate/readonly.go
similarity index 89%
rename from pkg/schema/validate/readonly.go
rename to schema/validate/readonly.go
index 8738d747dd1d86fad7203f20b9df83cb5d2334a4..041e225794b7f3bca1983a36bd674a0b191f832d 100644
--- a/pkg/schema/validate/readonly.go
+++ b/schema/validate/readonly.go
@@ -4,7 +4,7 @@ import (
"context"
"errors"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
type readonly bool
diff --git a/pkg/schema/validate/readonly_test.go b/schema/validate/readonly_test.go
similarity index 93%
rename from pkg/schema/validate/readonly_test.go
rename to schema/validate/readonly_test.go
index 379d906e139cb1191ef11751cc68ccb10766040f..09fc7ccff5c6daf384846fdfbe71d417149b7118 100644
--- a/pkg/schema/validate/readonly_test.go
+++ b/schema/validate/readonly_test.go
@@ -4,7 +4,7 @@ import (
"context"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/schema/validate/required.go b/schema/validate/required.go
similarity index 93%
rename from pkg/schema/validate/required.go
rename to schema/validate/required.go
index 96591e6eaf4134f07523ab87f29e932b8fcee60e..c3179c9e64dcd046352f33bb5e370c9cdfce111a 100644
--- a/pkg/schema/validate/required.go
+++ b/schema/validate/required.go
@@ -4,7 +4,7 @@ import (
"context"
"errors"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
type required bool
diff --git a/pkg/schema/validate/required_test.go b/schema/validate/required_test.go
similarity index 98%
rename from pkg/schema/validate/required_test.go
rename to schema/validate/required_test.go
index b22a3748fa1a6459d33e76b9114b7dc9a6165351..8e7d195a792d7a35dcc4be5a2cc1d49120a17ea8 100644
--- a/pkg/schema/validate/required_test.go
+++ b/schema/validate/required_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/schema/validate/string.go b/schema/validate/string.go
similarity index 97%
rename from pkg/schema/validate/string.go
rename to schema/validate/string.go
index 33fa453d0c707b893803f6e43484e50f232e8506..5dd857bf74ea6ff74edb7a0cfb20f10aeda0e552 100644
--- a/pkg/schema/validate/string.go
+++ b/schema/validate/string.go
@@ -6,7 +6,7 @@ import (
"reflect"
"unicode/utf8"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/pkg/errors"
)
diff --git a/pkg/schema/validate/string_test.go b/schema/validate/string_test.go
similarity index 99%
rename from pkg/schema/validate/string_test.go
rename to schema/validate/string_test.go
index 0fac9bb7c83d4a49b2b834cd779c74f3be529230..f563a3ad20652b1f62fd2fedf935952b9d29f8d7 100644
--- a/pkg/schema/validate/string_test.go
+++ b/schema/validate/string_test.go
@@ -4,7 +4,7 @@ import (
"context"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/schema/validate/validate.go b/schema/validate/validate.go
similarity index 97%
rename from pkg/schema/validate/validate.go
rename to schema/validate/validate.go
index 65ac4c400d19055deae67ddfcc5678775d0e3376..841292799b41f26de4cbb4ab12ccdbec41580c2c 100644
--- a/pkg/schema/validate/validate.go
+++ b/schema/validate/validate.go
@@ -6,7 +6,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/expr"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
const ValidatorPriority = 2000
diff --git a/pkg/schema/walk/fn.go b/schema/walk/fn.go
similarity index 100%
rename from pkg/schema/walk/fn.go
rename to schema/walk/fn.go
diff --git a/pkg/schema/walk/walk.go b/schema/walk/walk.go
similarity index 97%
rename from pkg/schema/walk/walk.go
rename to schema/walk/walk.go
index ab11ebe6ee0614a702c4c2a0f5747afe0e994ea4..c9ab1663df95e884c101dd7951cd144cbf50c842 100644
--- a/pkg/schema/walk/walk.go
+++ b/schema/walk/walk.go
@@ -5,8 +5,8 @@ import (
"fmt"
"strings"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
// DataFunc тип для функции обработки данных
@@ -154,7 +154,6 @@ func (m *Walker) datawalk(w *WalkContext) (err error) {
w.Dst = res
}
-
case *field.ArrayParameters:
d, _ := w.Dst.([]interface{})
s, _ := w.Src.([]interface{})
diff --git a/pkg/schema/walk/walk_test.go b/schema/walk/walk_test.go
similarity index 99%
rename from pkg/schema/walk/walk_test.go
rename to schema/walk/walk_test.go
index be33aa2fed74abb6493cd9aa5dd2b3470847c3d8..3514ce55c023fbe883d7f7db9d711dec7449dc86 100644
--- a/pkg/schema/walk/walk_test.go
+++ b/schema/walk/walk_test.go
@@ -4,8 +4,8 @@ import (
"context"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)