Merge branch 'master' of https://github.com/ballerina-platform/baller…

…ina-lang into issue-ballerina-platform#34821

.github/workflows/language_server_simulator.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: 
-        branch: ["master", "2201.1.x", "2201.2.x", "2201.2.2-stage", "2201.3.x", "2201.3.0-stage"]
+        branch: ["master", "2201.2.x", "2201.3.x", "2201.3.0-stage"]
         skipGenerators: ["", "IMPORT_STATEMENT"]
 
     steps:

.github/workflows/nightly_publish_timestamped_release.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       max-parallel: 4
       matrix:
-        branch: ['master', '2201.0.x', '2201.1.x', '2201.2.x']
+        branch: ['master', '2201.2.x', '2201.3.x']
     timeout-minutes: 240
     if: github.repository_owner == 'ballerina-platform'
     steps:

.github/workflows/pull_request_full_build.yml

@@ -72,15 +72,15 @@ jobs:
           do git clone https://github.com/ballerina-platform/${module_name}.git; \
           done
 
-      - name: Checkout non-default branch
-        run: |
-          for module_name in $(jq -r '.standard_library| .[] | select(.level==${{ matrix.level }}) | .name' extensions.json); \
-          do 
-            cd $module_name
-            git fetch origin
-            git checkout -t origin/update4 || :
-            cd ..
-          done
+#       - name: Checkout non-default branch
+#         run: |
+#           for module_name in $(jq -r '.standard_library| .[] | select(.level==${{ matrix.level }}) | .name' extensions.json); \
+#           do 
+#             cd $module_name
+#             git fetch origin
+#             git checkout -t origin/update4 || :
+#             cd ..
+#           done
 
       - name: Update Lang Version in Module
         run: |

.github/workflows/pull_request_ubuntu_build.yml

@@ -13,6 +13,7 @@ on:
       - 2201.[0-9]+.x
       - 2201.[0-9]+.[0-9]+-stage
       - native-build
+      - revert-client-decl-master
 
 jobs:
   ubuntu_build:

.github/workflows/pull_request_windows_build.yml

@@ -13,6 +13,7 @@ on:
       - 2201.[0-9]+.x
       - 2201.[0-9]+.[0-9]+-stage
       - native-build
+      - revert-client-decl-master
 
 jobs:
   windows_build:

.gitignore

@@ -33,7 +33,6 @@ velocity.log
 /composer/modules/web/dist-electron
 extractedDistribution
 misc/testerina/modules/report-tools/node_modules/
-generated
 
 # gradle
 .gradle

bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/Runtime.java

@@ -23,6 +23,7 @@
 import io.ballerina.runtime.api.types.ObjectType;
 import io.ballerina.runtime.api.types.Type;
 import io.ballerina.runtime.api.utils.StringUtils;
+import io.ballerina.runtime.api.utils.TypeUtils;
 import io.ballerina.runtime.api.values.BError;
 import io.ballerina.runtime.api.values.BFunctionPointer;
 import io.ballerina.runtime.api.values.BFuture;
@@ -183,7 +184,7 @@ public BFuture invokeMethodAsync(BObject object, String methodName, String stran
                                      Type returnType, Object... args) {
         try {
             validateArgs(object, methodName);
-            ObjectType objectType = object.getType();
+            ObjectType objectType = (ObjectType) TypeUtils.getReferredType(object.getType());
             boolean isIsolated = objectType.isIsolated() && objectType.isIsolated(methodName);
             FutureValue future = scheduler.createFuture(null, callback, properties, returnType, strandName, metadata);
             AsyncUtils.getArgsWithDefaultValues(scheduler, object, methodName, new Callback() {

bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/utils/JsonUtils.java

@@ -24,6 +24,7 @@
 import io.ballerina.runtime.api.types.ArrayType;
 import io.ballerina.runtime.api.types.JsonType;
 import io.ballerina.runtime.api.types.MapType;
+import io.ballerina.runtime.api.types.ReferenceType;
 import io.ballerina.runtime.api.types.StructureType;
 import io.ballerina.runtime.api.types.TableType;
 import io.ballerina.runtime.api.types.Type;
@@ -284,16 +285,23 @@ public static Object convertToJson(Object value, List<TypeValuePair> unresolvedV
             return null;
         }
         Type sourceType = TypeChecker.getType(value);
-        if (sourceType.getTag() <= TypeTags.BOOLEAN_TAG && TypeChecker.checkIsType(value, jsonType)) {
+        if (TypeUtils.getReferredType(sourceType).getTag() <= TypeTags.BOOLEAN_TAG && TypeChecker.checkIsType(value,
+                jsonType)) {
             return value;
         }
         TypeValuePair typeValuePair = new TypeValuePair(value, jsonType);
         if (unresolvedValues.contains(typeValuePair)) {
             throw createCyclicValueReferenceError(value);
         }
         unresolvedValues.add(typeValuePair);
-        Object newValue;
+        Object newValue = getJsonObject(value, unresolvedValues, jsonType, sourceType);
+        unresolvedValues.remove(typeValuePair);
+        return newValue;
+    }
 
+    private static Object getJsonObject(Object value, List<TypeValuePair> unresolvedValues, Type jsonType,
+                                    Type sourceType) {
+        Object newValue;
         switch (sourceType.getTag()) {
             case TypeTags.XML_TAG:
             case TypeTags.XML_ELEMENT_TAG:
@@ -309,7 +317,7 @@ public static Object convertToJson(Object value, List<TypeValuePair> unresolvedV
                 break;
             case TypeTags.TABLE_TAG:
                 BTable bTable = (BTable) value;
-                Type constrainedType = ((TableType) bTable.getType()).getConstrainedType();
+                Type constrainedType = ((TableType) sourceType).getConstrainedType();
                 if (constrainedType.getTag() == TypeTags.MAP_TAG) {
                     newValue = convertMapConstrainedTableToJson((BTable) value, unresolvedValues);
                 } else {
@@ -324,11 +332,14 @@ public static Object convertToJson(Object value, List<TypeValuePair> unresolvedV
             case TypeTags.MAP_TAG:
                 newValue = convertMapToJson((BMap<?, ?>) value, unresolvedValues);
                 break;
+            case TypeTags.TYPE_REFERENCED_TYPE_TAG:
+                newValue = getJsonObject(value, unresolvedValues, jsonType,
+                        ((ReferenceType) sourceType).getReferredType());
+                break;
             case TypeTags.ERROR_TAG:
             default:
                 throw createConversionError(value, jsonType);
         }
-        unresolvedValues.remove(typeValuePair);
         return newValue;
     }
 

bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/utils/StringUtils.java

@@ -171,7 +171,7 @@ public static String getStringValue(Object value, BLink parent) {
             return "";
         }
 
-        Type type = TypeChecker.getType(value);
+        Type type = TypeUtils.getReferredType(TypeChecker.getType(value));
 
         if (type.getTag() == TypeTags.STRING_TAG) {
             return ((BString) value).getValue();
@@ -203,7 +203,7 @@ public static String getStringValue(Object value, BLink parent) {
 
         if (type.getTag() == TypeTags.OBJECT_TYPE_TAG) {
             BObject objectValue = (BObject) value;
-            ObjectType objectType = objectValue.getType();
+            ObjectType objectType = (ObjectType) TypeUtils.getReferredType(objectValue.getType());
             for (MethodType func : objectType.getMethods()) {
                 if (func.getName().equals(TO_STRING) && func.getParameters().length == 0 &&
                         func.getType().getReturnType().getTag() == TypeTags.STRING_TAG) {
@@ -228,7 +228,7 @@ public static String getExpressionStringValue(Object value, BLink parent) {
             return "()";
         }
 
-        Type type = TypeChecker.getType(value);
+        Type type = TypeUtils.getReferredType(TypeChecker.getType(value));
 
         if (type.getTag() == TypeTags.STRING_TAG) {
             return "\"" + ((BString) value).getValue() + "\"";
@@ -274,7 +274,7 @@ public static String getExpressionStringValue(Object value, BLink parent) {
 
         if (type.getTag() == TypeTags.OBJECT_TYPE_TAG) {
             AbstractObjectValue objectValue = (AbstractObjectValue) value;
-            ObjectType objectType = objectValue.getType();
+            ObjectType objectType = (ObjectType) TypeUtils.getReferredType(objectValue.getType());
             for (MethodType func : objectType.getMethods()) {
                 if (func.getName().equals(TO_STRING) && func.getParameters().length == 0 &&
                         func.getType().getReturnType().getTag() == TypeTags.STRING_TAG) {
@@ -357,7 +357,7 @@ public static Object parseExpressionStringValue(String value, BLink parent) thro
     public static String getJsonString(Object value) {
         Object jsonValue = JsonUtils.convertToJson(value, new ArrayList<>());
 
-        Type type = TypeChecker.getType(jsonValue);
+        Type type = TypeUtils.getReferredType(TypeChecker.getType(jsonValue));
         switch (type.getTag()) {
             case TypeTags.NULL_TAG:
                 return "null";

bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/utils/TypeUtils.java

@@ -37,6 +37,7 @@
 import static io.ballerina.runtime.api.PredefinedTypes.TYPE_INT;
 import static io.ballerina.runtime.api.PredefinedTypes.TYPE_JSON;
 import static io.ballerina.runtime.api.PredefinedTypes.TYPE_MAP;
+import static io.ballerina.runtime.api.PredefinedTypes.TYPE_NEVER;
 import static io.ballerina.runtime.api.PredefinedTypes.TYPE_NULL;
 import static io.ballerina.runtime.api.PredefinedTypes.TYPE_STREAM;
 import static io.ballerina.runtime.api.PredefinedTypes.TYPE_STRING;
@@ -55,23 +56,26 @@ private TypeUtils() {
     }
 
     public static boolean isValueType(Type type) {
-        if (type == TYPE_INT || type == TYPE_BYTE ||
-                type == TYPE_FLOAT ||
-                type == TYPE_DECIMAL || type == TYPE_STRING ||
-                type == TYPE_BOOLEAN) {
-            return true;
-        }
-
-        if (type != null && type.getTag() == TypeTags.FINITE_TYPE_TAG) {
-            // All the types in value space should be value types.
-            for (Object value : ((BFiniteType) type).valueSpace) {
-                if (!isValueType(TypeChecker.getType(value))) {
-                    return false;
+        Type referredType = TypeUtils.getReferredType(type);
+        switch (referredType.getTag()) {
+            case TypeTags.INT_TAG:
+            case TypeTags.BYTE_TAG:
+            case TypeTags.FLOAT_TAG:
+            case TypeTags.DECIMAL_TAG:
+            case TypeTags.BOOLEAN_TAG:
+            case TypeTags.STRING_TAG:
+                return true;
+            case TypeTags.FINITE_TYPE_TAG:
+                for (Object value : ((BFiniteType) referredType).valueSpace) {
+                    if (!isValueType(TypeChecker.getType(value))) {
+                        return false;
+                    }
                 }
-            }
-            return true;
+                return true;
+            default:
+                return false;
+
         }
-        return false;
     }
 
     public static Type getTypeFromName(String typeName) {
@@ -110,6 +114,8 @@ public static Type getTypeFromName(String typeName) {
                 return TYPE_ERROR;
             case TypeConstants.ANYDATA_TNAME:
                 return TYPE_ANYDATA;
+            case TypeConstants.NEVER_TNAME:
+                return TYPE_NEVER;
             default:
                 throw new IllegalStateException("Unknown type name");
         }

bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/values/BObject.java

@@ -17,7 +17,7 @@
  */
 package io.ballerina.runtime.api.values;
 
-import io.ballerina.runtime.api.types.ObjectType;
+import io.ballerina.runtime.api.types.Type;
 import io.ballerina.runtime.internal.scheduling.Strand;
 import io.ballerina.runtime.internal.values.RefValue;
 
@@ -36,7 +36,7 @@ public interface BObject extends RefValue {
 
     BFuture start(Strand strand, String funcName, Object... args);
 
-    ObjectType getType();
+    Type getType();
 
     Object get(BString fieldName);
 

bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/JsonGenerator.java

@@ -18,6 +18,7 @@
 package io.ballerina.runtime.internal;
 
 import io.ballerina.runtime.api.TypeTags;
+import io.ballerina.runtime.api.utils.TypeUtils;
 import io.ballerina.runtime.api.values.BString;
 import io.ballerina.runtime.internal.values.ArrayValue;
 import io.ballerina.runtime.internal.values.DecimalValue;
@@ -279,7 +280,7 @@ public void serialize(Object json) throws IOException {
             return;
         }
 
-        switch (TypeChecker.getType(json).getTag()) {
+        switch (TypeUtils.getReferredType(TypeChecker.getType(json)).getTag()) {
             case TypeTags.ARRAY_TAG:
                 if (json instanceof StreamingJsonValue) {
                     ((StreamingJsonValue) json).serialize(this);

bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/JsonInternalUtils.java

@@ -248,7 +248,7 @@ public static boolean isJSONObject(Object json) {
             return false;
         }
 
-        Type type = ((RefValue) json).getType();
+        Type type = TypeUtils.getReferredType(((RefValue) json).getType());
         int typeTag = type.getTag();
         return typeTag == TypeTags.MAP_TAG || typeTag == TypeTags.RECORD_TYPE_TAG;
     }
@@ -398,7 +398,7 @@ public static Object convertUnionTypeToJSON(Object source, JsonType targetType)
             return null;
         }
 
-        Type type = TypeChecker.getType(source);
+        Type type = TypeUtils.getReferredType(TypeChecker.getType(source));
         switch (type.getTag()) {
             case TypeTags.INT_TAG:
             case TypeTags.FLOAT_TAG:
@@ -438,8 +438,8 @@ public static BError getErrorIfUnmergeable(Object j1, Object j2, List<ObjectPair
             return null;
         }
 
-        Type j1Type = TypeChecker.getType(j1);
-        Type j2Type = TypeChecker.getType(j2);
+        Type j1Type = TypeUtils.getReferredType(TypeChecker.getType(j1));
+        Type j2Type = TypeUtils.getReferredType(TypeChecker.getType(j2));
 
         if (j1Type.getTag() != TypeTags.MAP_TAG || j2Type.getTag() != TypeTags.MAP_TAG) {
             return ErrorCreator.createError(BallerinaErrorReasons.MERGE_JSON_ERROR,
@@ -491,8 +491,8 @@ public static Object mergeJson(Object j1, Object j2, boolean checkMergeability)
         }
 
         if (checkMergeability) {
-            Type j1Type = TypeChecker.getType(j1);
-            Type j2Type = TypeChecker.getType(j2);
+            Type j1Type = TypeUtils.getReferredType(TypeChecker.getType(j1));
+            Type j2Type = TypeUtils.getReferredType(TypeChecker.getType(j2));
 
             if (j1Type.getTag() != TypeTags.MAP_TAG || j2Type.getTag() != TypeTags.MAP_TAG) {
                 return ErrorCreator.createError(BallerinaErrorReasons.MERGE_JSON_ERROR,
@@ -697,7 +697,7 @@ private static ArrayValue convertRefArrayToJSON(BArray refValueArray) {
                 json.append(null);
             }
 
-            Type type = TypeChecker.getType(value);
+            Type type = TypeUtils.getReferredType(TypeChecker.getType(value));
             switch (type.getTag()) {
                 case TypeTags.JSON_TAG:
                     json.append(value);
@@ -784,7 +784,7 @@ private static void populateJSON(BMap<BString, Object> json, BString key, Object
                 return;
             }
 
-            Type type = TypeChecker.getType(value);
+            Type type = TypeUtils.getReferredType(TypeChecker.getType(value));
             switch (type.getTag()) {
                 case TypeTags.INT_TAG:
                 case TypeTags.FLOAT_TAG:

bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/JsonParser.java

@@ -23,6 +23,7 @@
 import io.ballerina.runtime.api.types.Type;
 import io.ballerina.runtime.api.utils.JsonUtils;
 import io.ballerina.runtime.api.utils.StringUtils;
+import io.ballerina.runtime.api.utils.TypeUtils;
 import io.ballerina.runtime.api.values.BError;
 import io.ballerina.runtime.api.values.BString;
 import io.ballerina.runtime.internal.types.BArrayType;
@@ -310,7 +311,7 @@ private State finalizeObject() {
             }
 
             Object parentNode = this.nodesStack.pop();
-            if (TypeChecker.getType(parentNode).getTag() == TypeTags.MAP_TAG) {
+            if (TypeUtils.getReferredType(TypeChecker.getType(parentNode)).getTag() == TypeTags.MAP_TAG) {
                 ((MapValueImpl<BString, Object>) parentNode).put(StringUtils.fromString(fieldNames.pop()),
                                                                  currentJsonNode);
                 currentJsonNode = parentNode;

bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TableJsonDataSource.java

@@ -21,6 +21,7 @@
 import io.ballerina.runtime.api.TypeTags;
 import io.ballerina.runtime.api.types.Type;
 import io.ballerina.runtime.api.utils.StringUtils;
+import io.ballerina.runtime.api.utils.TypeUtils;
 import io.ballerina.runtime.api.values.BArray;
 import io.ballerina.runtime.api.values.BIterator;
 import io.ballerina.runtime.api.values.BMap;
@@ -104,7 +105,7 @@ private static class DefaultJSONObjectGenerator implements JSONObjectGenerator {
         public Object transform(BMap<?, ?> record) {
             MapValue<BString, Object> objNode = new MapValueImpl<>(new BMapType(PredefinedTypes.TYPE_JSON));
             for (Map.Entry entry : record.entrySet()) {
-                Type type = TypeChecker.getType(entry.getValue());
+                Type type = TypeUtils.getReferredType(TypeChecker.getType(entry.getValue()));
                 BString keyName = StringUtils.fromString(entry.getKey().toString());
                 constructJsonData(record, objNode, keyName, type);
             }
@@ -151,7 +152,7 @@ private static void constructJsonData(BMap<?, ?> record, MapValue<BString, Objec
             case TypeTags.RECORD_TYPE_TAG:
                 MapValue<BString, Object> jsonData = new MapValueImpl<>(new BMapType(PredefinedTypes.TYPE_JSON));
                 for (Map.Entry entry : record.getMapValue(key).entrySet()) {
-                    Type internalType = TypeChecker.getType(entry.getValue());
+                    Type internalType = TypeUtils.getReferredType(TypeChecker.getType(entry.getValue()));
                     BString internalKeyName = StringUtils.fromString(entry.getKey().toString());
                     constructJsonData(record.getMapValue(key), jsonData, internalKeyName, internalType);
                 }

bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TableUtils.java

@@ -96,6 +96,8 @@ public static Long hash(Object obj, Node parent) {
             } else {
                 return (long) obj.hashCode();
             }
+        } else if (obj instanceof Long) {
+            return (long) obj;
         } else {
             return (long) obj.hashCode();
         }