Merge "vdl/js: Use the lowercased exports of the vdl namespace"
diff --git a/lib/vdl/codegen/javascript/const_test.go b/lib/vdl/codegen/javascript/const_test.go
index f6250a4..1cc7c61 100644
--- a/lib/vdl/codegen/javascript/const_test.go
+++ b/lib/vdl/codegen/javascript/const_test.go
@@ -28,7 +28,7 @@
{
name: "struct test",
inputValue: structValue,
- expected: `canonicalize.reduce(new (vdl.Registry.lookupOrCreateConstructor(_typeNamedStruct))({
+ expected: `canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNamedStruct))({
'list': [
],
'bool': false,
@@ -40,7 +40,7 @@
{
name: "bytes test",
inputValue: vdl.BytesValue([]byte{1, 2, 3, 4}),
- expected: `canonicalize.reduce(new (vdl.Registry.lookupOrCreateConstructor(_type2))(new Uint8Array([
+ expected: `canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_type2))(new Uint8Array([
1,
2,
3,
diff --git a/lib/vdl/codegen/javascript/error_test.go b/lib/vdl/codegen/javascript/error_test.go
index a14463f..36fecfd 100644
--- a/lib/vdl/codegen/javascript/error_test.go
+++ b/lib/vdl/codegen/javascript/error_test.go
@@ -50,8 +50,8 @@
'en-US': 'english string',
'fr': 'french string',
}, [
- vdl.Types.BOOL,
- vdl.Types.INT32,
+ vdl.types.BOOL,
+ vdl.types.INT32,
]);
`
if result != expected {
diff --git a/lib/vdl/codegen/javascript/gen.go b/lib/vdl/codegen/javascript/gen.go
index 26b8a26..bb86600 100644
--- a/lib/vdl/codegen/javascript/gen.go
+++ b/lib/vdl/codegen/javascript/gen.go
@@ -205,9 +205,9 @@
func primitiveWithOptionalName(primitive, name string) string {
if name == "" {
- return "Types." + primitive
+ return "types." + primitive
}
- return "new vdl.Type({kind: Kind." + primitive + ", name: '" + name + "'})"
+ return "new vdl.Type({kind: vdl.kind." + primitive + ", name: '" + name + "'})"
}
// typedConst returns a javascript string representing a const that is always
@@ -386,7 +386,7 @@
if data.PathToCoreJS != "" {
res += "var canonicalize = require('" + packagePrefix + "/vdl/canonicalize');\n"
} else {
- res += "var canonicalize = require('vanadium').vdl.Canonicalize;\n"
+ res += "var canonicalize = require('vanadium').vdl.canonicalize;\n"
}
}
return res
diff --git a/lib/vdl/codegen/javascript/gen_type_def.go b/lib/vdl/codegen/javascript/gen_type_def.go
index 3719aa6..19c60bf 100644
--- a/lib/vdl/codegen/javascript/gen_type_def.go
+++ b/lib/vdl/codegen/javascript/gen_type_def.go
@@ -142,51 +142,51 @@
func jsKind(k vdl.Kind) string {
switch k {
case vdl.Any:
- return "vdl.Kind.ANY"
+ return "vdl.kind.ANY"
case vdl.Union:
- return "vdl.Kind.UNION"
+ return "vdl.kind.UNION"
case vdl.Optional:
- return "vdl.Kind.OPTIONAL"
+ return "vdl.kind.OPTIONAL"
case vdl.Bool:
- return "vdl.Kind.BOOL"
+ return "vdl.kind.BOOL"
case vdl.Byte:
- return "vdl.Kind.BYTE"
+ return "vdl.kind.BYTE"
case vdl.Uint16:
- return "vdl.Kind.UINT16"
+ return "vdl.kind.UINT16"
case vdl.Uint32:
- return "vdl.Kind.UINT32"
+ return "vdl.kind.UINT32"
case vdl.Uint64:
- return "vdl.Kind.UINT64"
+ return "vdl.kind.UINT64"
case vdl.Int16:
- return "vdl.Kind.INT16"
+ return "vdl.kind.INT16"
case vdl.Int32:
- return "vdl.Kind.INT32"
+ return "vdl.kind.INT32"
case vdl.Int64:
- return "vdl.Kind.INT64"
+ return "vdl.kind.INT64"
case vdl.Float32:
- return "vdl.Kind.FLOAT32"
+ return "vdl.kind.FLOAT32"
case vdl.Float64:
- return "vdl.Kind.FLOAT64"
+ return "vdl.kind.FLOAT64"
case vdl.Complex64:
- return "vdl.Kind.COMPLEX64"
+ return "vdl.kind.COMPLEX64"
case vdl.Complex128:
- return "vdl.Kind.COMPLEX128"
+ return "vdl.kind.COMPLEX128"
case vdl.String:
- return "vdl.Kind.STRING"
+ return "vdl.kind.STRING"
case vdl.Enum:
- return "vdl.Kind.ENUM"
+ return "vdl.kind.ENUM"
case vdl.TypeObject:
- return "vdl.Kind.TYPEOBJECT"
+ return "vdl.kind.TYPEOBJECT"
case vdl.Array:
- return "vdl.Kind.ARRAY"
+ return "vdl.kind.ARRAY"
case vdl.List:
- return "vdl.Kind.LIST"
+ return "vdl.kind.LIST"
case vdl.Set:
- return "vdl.Kind.SET"
+ return "vdl.kind.SET"
case vdl.Map:
- return "vdl.Kind.MAP"
+ return "vdl.kind.MAP"
case vdl.Struct:
- return "vdl.Kind.STRUCT"
+ return "vdl.kind.STRUCT"
}
panic(fmt.Errorf("val: unhandled kind: %d", k))
}
@@ -198,7 +198,7 @@
_, n := vdl.SplitIdent(t.Name())
if t == vdl.ErrorType {
- return "vdl.Types.ERROR", true
+ return "vdl.types.ERROR", true
}
// named types are not built-in.
@@ -209,35 +209,35 @@
// switch on supported types in vdl.js
switch t.Kind() {
case vdl.Any:
- return "vdl.Types.ANY", true
+ return "vdl.types.ANY", true
case vdl.Bool:
- return "vdl.Types.BOOL", true
+ return "vdl.types.BOOL", true
case vdl.Byte:
- return "vdl.Types.BYTE", true
+ return "vdl.types.BYTE", true
case vdl.Uint16:
- return "vdl.Types.UINT16", true
+ return "vdl.types.UINT16", true
case vdl.Uint32:
- return "vdl.Types.UINT32", true
+ return "vdl.types.UINT32", true
case vdl.Uint64:
- return "vdl.Types.UINT64", true
+ return "vdl.types.UINT64", true
case vdl.Int16:
- return "vdl.Types.INT16", true
+ return "vdl.types.INT16", true
case vdl.Int32:
- return "vdl.Types.INT32", true
+ return "vdl.types.INT32", true
case vdl.Int64:
- return "vdl.Types.INT64", true
+ return "vdl.types.INT64", true
case vdl.Float32:
- return "vdl.Types.FLOAT32", true
+ return "vdl.types.FLOAT32", true
case vdl.Float64:
- return "vdl.Types.FLOAT64", true
+ return "vdl.types.FLOAT64", true
case vdl.Complex64:
- return "vdl.Types.COMPLEX64", true
+ return "vdl.types.COMPLEX64", true
case vdl.Complex128:
- return "vdl.Types.COMPLEX128", true
+ return "vdl.types.COMPLEX128", true
case vdl.String:
- return "vdl.Types.STRING", true
+ return "vdl.types.STRING", true
case vdl.TypeObject:
- return "vdl.Types.TYPEOBJECT", true
+ return "vdl.types.TYPEOBJECT", true
}
return "", false
diff --git a/lib/vdl/codegen/javascript/pkg_types.go b/lib/vdl/codegen/javascript/pkg_types.go
index cf4e88b..b2dc8fd 100644
--- a/lib/vdl/codegen/javascript/pkg_types.go
+++ b/lib/vdl/codegen/javascript/pkg_types.go
@@ -42,7 +42,7 @@
}
func (tn typeNames) constructorFromTypeName(name string) string {
- return "(vdl.Registry.lookupOrCreateConstructor(" + name + "))"
+ return "(vdl.registry.lookupOrCreateConstructor(" + name + "))"
}
// LookupType returns a string representing the type.
diff --git a/lib/vdl/codegen/javascript/type_test.go b/lib/vdl/codegen/javascript/type_test.go
index 13468c6..bdc7619 100644
--- a/lib/vdl/codegen/javascript/type_test.go
+++ b/lib/vdl/codegen/javascript/type_test.go
@@ -85,19 +85,19 @@
var _typeColorsBeginningWithAOrB = new vdl.Type();
var _typeNamedList = new vdl.Type();
var _typeNamedStruct = new vdl.Type();
-_type1.kind = vdl.Kind.LIST;
+_type1.kind = vdl.kind.LIST;
_type1.name = "";
-_type1.elem = vdl.Types.STRING;
-_type2.kind = vdl.Kind.LIST;
+_type1.elem = vdl.types.STRING;
+_type2.kind = vdl.kind.LIST;
_type2.name = "";
-_type2.elem = vdl.Types.BYTE;
-_typeColorsBeginningWithAOrB.kind = vdl.Kind.ENUM;
+_type2.elem = vdl.types.BYTE;
+_typeColorsBeginningWithAOrB.kind = vdl.kind.ENUM;
_typeColorsBeginningWithAOrB.name = "ColorsBeginningWithAOrB";
_typeColorsBeginningWithAOrB.labels = ["Aqua", "Beige"];
-_typeNamedList.kind = vdl.Kind.LIST;
+_typeNamedList.kind = vdl.kind.LIST;
_typeNamedList.name = "NamedList";
_typeNamedList.elem = _typeNamedStruct;
-_typeNamedStruct.kind = vdl.Kind.STRUCT;
+_typeNamedStruct.kind = vdl.kind.STRUCT;
_typeNamedStruct.name = "NamedStruct";
_typeNamedStruct.fields = [{name: "List", type: _typeNamedList}, {name: "Bool", type: new otherPkg.NamedBool()._type}, {name: "UnnamedTypeField", type: _type1}];
_type1.freeze();
@@ -106,11 +106,11 @@
_typeNamedList.freeze();
_typeNamedStruct.freeze();
module.exports.ColorsBeginningWithAOrB = {
- AQUA: canonicalize.reduce(new (vdl.Registry.lookupOrCreateConstructor(_typeColorsBeginningWithAOrB))('Aqua', true), _typeColorsBeginningWithAOrB),
- BEIGE: canonicalize.reduce(new (vdl.Registry.lookupOrCreateConstructor(_typeColorsBeginningWithAOrB))('Beige', true), _typeColorsBeginningWithAOrB),
+ AQUA: canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeColorsBeginningWithAOrB))('Aqua', true), _typeColorsBeginningWithAOrB),
+ BEIGE: canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeColorsBeginningWithAOrB))('Beige', true), _typeColorsBeginningWithAOrB),
};
-module.exports.NamedList = (vdl.Registry.lookupOrCreateConstructor(_typeNamedList));
-module.exports.NamedStruct = (vdl.Registry.lookupOrCreateConstructor(_typeNamedStruct));
+module.exports.NamedList = (vdl.registry.lookupOrCreateConstructor(_typeNamedList));
+module.exports.NamedStruct = (vdl.registry.lookupOrCreateConstructor(_typeNamedStruct));
`
if result != expectedResult {
