Merge branch 'master' into feature/python-obj-api-decode-strings

Author: aardappel

.eslintrc.js

@@ -394,7 +394,7 @@ jobs:
       # Force Xcode 14.3 since Xcode 15 doesnt support older versions of
       # kotlin. For Xcode 15, kotlin should be bumpped to 1.9.10
       # https://stackoverflow.com/a/77150623
-      # For now, run with macos-13 which has this 14.3 installed: 
+      # For now, run with macos-13 which has this 14.3 installed:
       # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#xcode
     - name: Set up Xcode version
       run: sudo xcode-select -s /Applications/Xcode_14.3.app/Contents/Developer
@@ -534,14 +534,15 @@ jobs:
     - name: flatc
       # FIXME: make test script not rely on flatc
       run: cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DFLATBUFFERS_BUILD_TESTS=OFF -DFLATBUFFERS_INSTALL=OFF -DFLATBUFFERS_BUILD_FLATLIB=OFF -DFLATBUFFERS_BUILD_FLATHASH=OFF . && make -j
+    - name: pnpm
+      run: npm install -g pnpm esbuild
     - name: deps
-      run: yarn
+      run: pnpm i
     - name: compile
-      run: yarn compile
+      run: pnpm compile
     - name: test
       working-directory: tests/ts
       run: |
-        yarn global add esbuild
         python3 TypeScriptTest.py
 
   build-dart:
@@ -582,12 +583,12 @@ jobs:
       - uses: actions/checkout@v3
       - name: bazel build
         run: >
-          bazel build 
+          bazel build
           //:flatc
           //:flatbuffers
       - name: bazel test
         run: >
-          bazel test 
+          bazel test
           //tests:flatbuffers_test
 
   release-digests:

.github/workflows/build.yml

@@ -15,11 +15,11 @@ bazel_dep(
 )
 bazel_dep(
     name = "aspect_rules_js",
-    version = "2.1.3",
+    version = "2.3.8",
 )
 bazel_dep(
     name = "aspect_rules_ts",
-    version = "3.4.0",
+    version = "3.6.0",
 )
 bazel_dep(
     name = "grpc",

MODULE.bazel

@@ -20,17 +20,28 @@ import PackageDescription
 let package = Package(
   name: "FlatBuffers",
   platforms: [
-    .iOS(.v11),
+    .iOS(.v12),
     .macOS(.v10_14),
   ],
   products: [
     .library(
       name: "FlatBuffers",
       targets: ["FlatBuffers"]),
+    .library(
+      name: "FlexBuffers",
+      targets: ["FlexBuffers"]),
   ],
   targets: [
     .target(
       name: "FlatBuffers",
+      dependencies: ["Common"],
+      path: "swift/Sources/FlatBuffers"),
+    .target(
+      name: "FlexBuffers",
+      dependencies: ["Common"],
+      path: "swift/Sources/FlexBuffers"),
+    .target(
+      name: "Common",
       dependencies: [],
-      path: "swift/Sources"),
+      path: "swift/Sources/Common"),
   ])

Package.swift

@@ -131,7 +131,7 @@ list of `FILES...`.
 -   `--gen-mutable` : Generate additional non-const accessors for mutating
     FlatBuffers in-place.
 
--   `--gen-onefile` : Generate single output file for C#, Go, and Python.
+-   `--gen-onefile` : Generate a single output file for C#, Go, Java, Kotlin and Python.
 
 -   `--gen-name-strings` : Generate type name functions for C++.
 

docs/source/flatc.md

@@ -0,0 +1,10 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+import tseslint from "typescript-eslint";
+
+export default [
+  {files: ["**/*.{js,mjs,cjs,ts}"]},
+  {languageOptions: { globals: {...globals.browser, ...globals.node} }},
+  pluginJs.configs.recommended,
+  ...tseslint.configs.recommended,
+];

eslint.config.mjs

@@ -1,52 +1,54 @@
-# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+# Generated by the gRPC FlatBuffers compiler. DO NOT EDIT!
 
+import flatbuffers
 import grpc
 
+from models.HelloReply import HelloReply
+from models.HelloRequest import HelloRequest
+
+
 class GreeterStub(object):
-  """ Interface exported by the server. """  
-  
+  '''Interface exported by the server.'''
+
   def __init__(self, channel):
-    """ Constructor. 
-    
-    Args: 
-    channel: A grpc.Channel. 
-    """
-    
+    '''Constructor.
+
+    Args:
+      channel: A grpc.Channel.
+    '''
+
     self.SayHello = channel.unary_unary(
-      "/models.Greeter/SayHello"
-      )
-    
+      method='/models.Greeter/SayHello')
+
     self.SayManyHellos = channel.unary_stream(
-      "/models.Greeter/SayManyHellos"
-      )
-    
+      method='/models.Greeter/SayManyHellos')
+
 
 class GreeterServicer(object):
-  """ Interface exported by the server. """  
-  
+  '''Interface exported by the server.'''
+
   def SayHello(self, request, context):
     context.set_code(grpc.StatusCode.UNIMPLEMENTED)
     context.set_details('Method not implemented!')
     raise NotImplementedError('Method not implemented!')
-  
-  
+
   def SayManyHellos(self, request, context):
     context.set_code(grpc.StatusCode.UNIMPLEMENTED)
     context.set_details('Method not implemented!')
     raise NotImplementedError('Method not implemented!')
-  
-  
+
 
 def add_GreeterServicer_to_server(servicer, server):
   rpc_method_handlers = {
     'SayHello': grpc.unary_unary_rpc_method_handler(
-      servicer.SayHello
-    ),
+      servicer.SayHello),
     'SayManyHellos': grpc.unary_stream_rpc_method_handler(
-      servicer.SayManyHellos
-    ),
+      servicer.SayManyHellos),
   }
+
   generic_handler = grpc.method_handlers_generic_handler(
     'models.Greeter', rpc_method_handlers)
+
   server.add_generic_rpc_handlers((generic_handler,))
 
+

grpc/examples/python/greeter/models/greeter_grpc_fb.py

@@ -20,7 +20,7 @@ import PackageDescription
 let package = Package(
   name: "Greeter",
   platforms: [
-    .iOS(.v11),
+    .iOS(.v12),
     .macOS(.v10_14),
   ],
   dependencies: [

grpc/examples/swift/Greeter/Package.swift

@@ -37,12 +37,14 @@ namespace grpc {
 namespace {
 bool ClientStreaming(const RPCCall *method) {
   const Value *val = method->attributes.Lookup("streaming");
-  return val != nullptr && (val->constant == "client" || val->constant == "bidi");
+  return val != nullptr &&
+         (val->constant == "client" || val->constant == "bidi");
 }
 
 bool ServerStreaming(const RPCCall *method) {
   const Value *val = method->attributes.Lookup("streaming");
-  return val != nullptr && (val->constant == "server" || val->constant == "bidi");
+  return val != nullptr &&
+         (val->constant == "server" || val->constant == "bidi");
 }
 
 void FormatImports(std::stringstream &ss, const Imports &imports) {
@@ -103,9 +105,10 @@ class BaseGenerator {
  protected:
   BaseGenerator(const Parser &parser, const Namer::Config &config,
                 const std::string &path, const Version &version)
-      : parser_{parser},
-        namer_{WithFlagOptions(config, parser.opts, path), Keywords(version)},
-        version_{version} {}
+      : parser_{ parser },
+        namer_{ WithFlagOptions(config, parser.opts, path), Keywords(version) },
+        version_{ version },
+        path_(path) {}
 
  protected:
   std::string ModuleForFile(const std::string &file) const {
@@ -115,15 +118,34 @@ class BaseGenerator {
     return module;
   }
 
-  template <typename T>
-  std::string ModuleFor(const T *def) const {
+  template<typename T> std::string ModuleFor(const T *def) const {
     if (parser_.opts.one_file) return ModuleForFile(def->file);
     return namer_.NamespacedType(*def);
   }
 
+  std::string NamespaceDir(const Parser &parser, const std::string &path,
+                           const Namespace &ns, const bool dasherize) {
+    EnsureDirExists(path);
+    if (parser.opts.one_file) return path;
+    std::string namespace_dir = path;  // Either empty or ends in separator.
+    auto &namespaces = ns.components;
+    for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
+      namespace_dir +=
+          !dasherize ? *it : ConvertCase(*it, Case::kDasher, Case::kUpperCamel);
+      namespace_dir += kPathSeparator;
+      EnsureDirExists(namespace_dir);
+    }
+    return namespace_dir;
+  }
+
+  std::string NamespaceDir(const Namespace &ns, const bool dasherize) {
+    return NamespaceDir(parser_, path_, ns, dasherize);
+  }
+
   const Parser &parser_;
   const IdlNamer namer_;
   const Version version_;
+  const std::string &path_;
 };
 
 class StubGenerator : public BaseGenerator {
@@ -135,14 +157,18 @@ class StubGenerator : public BaseGenerator {
   bool Generate() {
     Imports imports;
     std::stringstream stub;
+    std::string ns_name{};
     for (const ServiceDef *service : parser_.services_.vec) {
       Generate(stub, service, &imports);
+      ns_name = NamespaceDir(*service->defined_namespace, false);
     }
 
+    std::string sanitized_suffix{ parser_.opts.grpc_filename_suffix };
+    std::replace(sanitized_suffix.begin(), sanitized_suffix.end(), '.', '_');
     std::string filename =
-        namer_.config_.output_path +
+        ns_name + kPathSeparator +
         StripPath(StripExtension(parser_.file_being_parsed_)) + "_grpc" +
-        parser_.opts.grpc_filename_suffix + namer_.config_.filename_extension;
+        sanitized_suffix + namer_.config_.filename_extension;
 
     return SaveStub(filename, imports, stub.str());
   }
@@ -247,16 +273,20 @@ class ServiceGenerator : public BaseGenerator {
          << '\n';
     }
 
+    std::string ns_name{};
     for (const ServiceDef *service : parser_.services_.vec) {
       GenerateStub(ss, service, &imports);
       GenerateServicer(ss, service, &imports);
       GenerateRegister(ss, service, &imports);
+      ns_name = NamespaceDir(*service->defined_namespace, false);
     }
 
+    std::string sanitized_suffix{ parser_.opts.grpc_filename_suffix };
+    std::replace(sanitized_suffix.begin(), sanitized_suffix.end(), '.', '_');
     std::string filename =
-        namer_.config_.output_path +
+        ns_name + kPathSeparator +
         StripPath(StripExtension(parser_.file_being_parsed_)) + "_grpc" +
-        parser_.opts.grpc_filename_suffix + namer_.config_.filename_extension;
+        sanitized_suffix + namer_.config_.filename_extension;
 
     return SaveService(filename, imports, ss.str());
   }
@@ -365,13 +395,13 @@ class ServiceGenerator : public BaseGenerator {
 
 bool Generate(const Parser &parser, const std::string &path,
               const Version &version) {
-  ServiceGenerator generator{parser, path, version};
+  ServiceGenerator generator{ parser, path, version };
   return generator.Generate();
 }
 
 bool GenerateStub(const Parser &parser, const std::string &path,
                   const Version &version) {
-  StubGenerator generator{parser, path, version};
+  StubGenerator generator{ parser, path, version };
   return generator.Generate();
 }
 

grpc/src/compiler/python_generator.cc

@@ -31,13 +31,10 @@ template<typename T, uint16_t length> class Array {
   // Array<T> can carry only POD data types (scalars or structs).
   typedef typename flatbuffers::bool_constant<flatbuffers::is_scalar<T>::value>
       scalar_tag;
-  typedef
-      typename flatbuffers::conditional<scalar_tag::value, T, const T *>::type
-          IndirectHelperType;
 
  public:
   typedef uint16_t size_type;
-  typedef typename IndirectHelper<IndirectHelperType>::return_type return_type;
+  typedef typename IndirectHelper<T>::return_type return_type;
   typedef VectorConstIterator<T, return_type, uoffset_t> const_iterator;
   typedef VectorReverseIterator<const_iterator> const_reverse_iterator;
 
@@ -50,7 +47,7 @@ template<typename T, uint16_t length> class Array {
 
   return_type Get(uoffset_t i) const {
     FLATBUFFERS_ASSERT(i < size());
-    return IndirectHelper<IndirectHelperType>::Read(Data(), i);
+    return IndirectHelper<T>::Read(Data(), i);
   }
 
   return_type operator[](uoffset_t i) const { return Get(i); }