Merge branch 'main' into fp/minimal-fts

* main:
  Pushing update to the package-lock.json
  Binding resolution refactored (#5802)
  Update install-test-react-native.yml (#5808)
  Add more testing of IN operator (#5809)

.github/workflows/install-test-react-native.yml

@@ -75,6 +75,7 @@ jobs:
       - uses: ruby/setup-ruby@v1
         if: ${{ matrix.platform == 'ios' }}
         with:
+          ruby-version: '3.0'
           bundler-cache: true
           working-directory: install-tests/react-native/app
 

integration-tests/tests/src/tests/queries.ts

@@ -985,6 +985,12 @@ describe("Queries", () => {
 
         const dennis = persons.filtered("name in {'Dennis'}");
         expect(dennis.length).equal(0);
+
+        const bobs = persons.filtered("name in $0", ["Bob"]);
+        expect(bobs.length).equal(1);
+
+        const many = persons.filtered("name in $0", ["Alice", "Dennis", "Bob"]);
+        expect(many.length).equal(2);
       });
 
       it("array of primitive types", () => {

packages/realm/.mocharc.json

@@ -2,6 +2,6 @@
   "loader": "tsx",
   "enable-source-maps": true,
   "no-warnings": true,
-  "require": "src/node/index.ts",
+  "require": "src/platform/node/index.ts",
   "spec": "src/tests/*.test.ts"
 }

packages/realm/bindgen/CMakeLists.txt

@@ -140,8 +140,8 @@ bindgen(
 )
 
 set(GENERATED_JS_FILES
-    ${TYPESCRIPT_OUTPUT_DIR}/native.mjs
-    ${TYPESCRIPT_OUTPUT_DIR}/native-rn.mjs
+    ${TYPESCRIPT_OUTPUT_DIR}/native-node.mjs
+    ${TYPESCRIPT_OUTPUT_DIR}/native-react-native.mjs
 )
 bindgen(
     TEMPLATE ${SDK_DIR}/bindgen/src/templates/node-wrapper.ts

packages/realm/bindgen/src/eslint-formatter.ts

@@ -0,0 +1,3 @@
+import { createCommandFormatter } from "@realm/bindgen/formatter";
+
+export const eslint = createCommandFormatter("eslint", ["npx", "eslint", "--fix", "--format=stylish"]);

packages/realm/bindgen/src/templates/jsi.ts

@@ -33,6 +33,7 @@ import {
 } from "@realm/bindgen/bound-model";
 
 import { doJsPasses } from "../js-passes";
+import { clangFormat } from "@realm/bindgen/formatter";
 
 // Code assumes this is a unique name that is always in scope to refer to the jsi::Runtime.
 // Callbacks need to ensure this is in scope. Functions taking Runtime arguments must use this name.
@@ -1040,7 +1041,7 @@ class JsiCppDecls extends CppDecls {
 }
 
 export function generate({ spec, file: makeFile }: TemplateContext): void {
-  const out = makeFile("jsi_init.cpp", "clang-format");
+  const out = makeFile("jsi_init.cpp", clangFormat);
 
   // HEADER
   out(`// This file is generated: Update the spec instead of editing this file directly`);

packages/realm/bindgen/src/templates/node-wrapper.ts

@@ -20,14 +20,15 @@ import { bindModel, Property } from "@realm/bindgen/bound-model";
 import { TemplateContext } from "@realm/bindgen/context";
 
 import { doJsPasses } from "../js-passes";
+import { eslint } from "../eslint-formatter";
 
 export function generate({ spec: rawSpec, file }: TemplateContext): void {
   const spec = doJsPasses(bindModel(rawSpec));
   const reactLines = [];
   const nodeLines = [];
-  function both(content: string) {
-    reactLines.push(content);
-    nodeLines.push(content);
+  function both(...content: string[]) {
+    reactLines.push(...content);
+    nodeLines.push(...content);
   }
 
   both("// This file is generated: Update the spec instead of editing this file directly");
@@ -204,6 +205,6 @@ export function generate({ spec: rawSpec, file }: TemplateContext): void {
 
   both(`nativeModule.injectInjectables({ ${injectables} });`);
 
-  file("native.mjs", "eslint")(nodeLines.join("\n"));
-  file("native-rn.mjs", "eslint")(reactLines.join("\n"));
+  file("native-node.mjs", eslint)(nodeLines.join("\n"));
+  file("native-react-native.mjs", eslint)(reactLines.join("\n"));
 }

packages/realm/bindgen/src/templates/node.ts

@@ -31,6 +31,7 @@ import {
   Pointer,
   Template,
 } from "@realm/bindgen/bound-model";
+import { clangFormat } from "@realm/bindgen/formatter";
 
 import { doJsPasses } from "../js-passes";
 
@@ -896,7 +897,7 @@ class NodeCppDecls extends CppDecls {
 }
 
 export function generate({ spec, file: makeFile }: TemplateContext): void {
-  const out = makeFile("node_init.cpp", "clang-format");
+  const out = makeFile("node_init.cpp", clangFormat);
 
   // HEADER
   out(`// This file is generated: Update the spec instead of editing this file directly`);

packages/realm/bindgen/src/templates/typescript.ts

@@ -16,26 +16,13 @@
 //
 ////////////////////////////////////////////////////////////////////////////
 
+import { strict as assert } from "node:assert";
+
 import { TemplateContext } from "@realm/bindgen/context";
 import { Arg, BoundSpec, NamedType, Property, Type, bindModel } from "@realm/bindgen/bound-model";
-import { strict as assert } from "assert";
 
 import { doJsPasses } from "../js-passes";
-
-import { addFormatter } from "@realm/bindgen/formatter";
-
-// Ideally, this would be codified in a tsconfig.json, but tsc doesn't support
-// configs mixed with filenames when invoked via the CLI.
-addFormatter("typescript-checker", [
-  "npx",
-  "tsc",
-  "--noEmit",
-  "--noResolve",
-  "--lib",
-  "es2022",
-  "--types",
-  "buffer,bson",
-]);
+import { eslint } from "../eslint-formatter";
 
 const PRIMITIVES_MAPPING: Record<string, string> = {
   void: "void",
@@ -162,7 +149,7 @@ export function generate({ spec: rawSpec, file }: TemplateContext): void {
 
   const spec = doJsPasses(bindModel(rawSpec));
 
-  const coreOut = file("core.ts", "eslint", "typescript-checker");
+  const coreOut = file("core.ts", eslint);
   coreOut("// This file is generated: Update the spec instead of editing this file directly");
 
   coreOut("// Enums");
@@ -180,12 +167,14 @@ export function generate({ spec: rawSpec, file }: TemplateContext): void {
     }
   `);
 
-  const out = file("native.d.mts", "eslint", "typescript-checker");
+  const out = file("native.d.mts", eslint);
   out("// This file is generated: Update the spec instead of editing this file directly");
 
+  out("declare module 'realm/binding' {");
+
   out('import { ObjectId, UUID, Decimal128 } from "bson";');
-  out("import { Float, ", spec.enums.map((e) => e.name).join(", "), '} from "./core";');
-  out('export * from "./core";');
+  out("import { Float, ", spec.enums.map((e) => e.name).join(", "), '} from "realm/binding/core";');
+  out('export * from "realm/binding/core";');
 
   out("// Utilities");
   out("export type AppError = Error & {code: number};");
@@ -216,7 +205,7 @@ export function generate({ spec: rawSpec, file }: TemplateContext): void {
 
   out("// Opaque types (including Key types)");
   for (const { jsName } of (spec.opaqueTypes as NamedType[]).concat(spec.keyTypes)) {
-    out.lines("/** Using an empty enum to express a nominal type */", `export declare enum ${jsName} {}`);
+    out.lines("/** Using an empty enum to express a nominal type */", `export enum ${jsName} {}`);
   }
 
   out("// Records");
@@ -278,4 +267,6 @@ export function generate({ spec: rawSpec, file }: TemplateContext): void {
     }
     out(`}`);
   }
+
+  out("} // end of module declaration");
 }

packages/realm/package.json

@@ -146,8 +146,8 @@
         "bindgen/src/templates/node-wrapper.ts"
       ],
       "output": [
-        "generated/ts/native.mjs",
-        "generated/ts/native-rn.mjs"
+        "generated/ts/native-node.mjs",
+        "generated/ts/native-react-native.mjs"
       ]
     },
     "bindgen:generate:spec-schema": {

packages/realm/rollup.config.mjs

@@ -38,7 +38,7 @@ if (ENABLE_TEST_COVERAGE_INSTRUMENTATION) {
 
 export default [
   {
-    input: "src/node/index.ts",
+    input: "src/platform/node/index.ts",
     output: [
       {
         file: mainExport.node,
@@ -72,15 +72,15 @@ export default [
       }),
       json(),
       typescript({
-        tsconfig: "src/node/tsconfig.json",
+        tsconfig: "src/platform/node/tsconfig.json",
         noEmitOnError: true,
         outputToFilesystem: true,
       }),
     ],
     external: ["bson", "debug", "node-fetch", "node:module", "node:fs", "node:path"],
   },
   {
-    input: "src/react-native/index.ts",
+    input: "src/platform/react-native/index.ts",
     output: {
       file: mainExport["react-native"],
       format: "es",
@@ -94,16 +94,9 @@ export default [
       }),
       // We need to use `commonjs` because of "path-browserify"
       commonjs(),
-      replace({
-        preventAssignment: true,
-        delimiters: ["", ""],
-        values: {
-          '"../generated/ts/native.mjs"': '"../generated/ts/native-rn.mjs"',
-        },
-      }),
       json(),
       typescript({
-        tsconfig: "src/react-native/tsconfig.json",
+        tsconfig: "src/platform/react-native/tsconfig.json",
         noEmitOnError: true,
         outputToFilesystem: true,
       }),

packages/realm/src/binding.ts

@@ -16,13 +16,13 @@
 //
 ////////////////////////////////////////////////////////////////////////////
 
-import { IndexSet, Int64, ObjKey, Timestamp } from "../generated/ts/native.mjs";
+import { IndexSet, Int64, ObjKey, Timestamp } from "realm/binding";
 
 /** @internal */
-export * from "../generated/ts/native.mjs"; // core types are transitively exported.
+export * from "realm/binding";
 
 /** @internal */
-declare module "../generated/ts/native.mjs" {
+declare module "realm/binding" {
   interface IndexSet {
     asIndexes(): Iterator<number>;
   }

packages/realm/src/node/device-info.ts → packages/realm/src/platform/node/device-info.ts

@@ -20,7 +20,7 @@ import os from "node:os";
 
 import { version } from "realm/package.json";
 
-import { inject } from "../platform/device-info";
+import { inject } from "../device-info";
 
 inject({
   create() {

packages/realm/src/node/fs.ts → packages/realm/src/platform/node/fs.ts

@@ -19,8 +19,8 @@
 import { existsSync, mkdirSync, readdirSync, rmSync, unlinkSync } from "node:fs";
 import { dirname, isAbsolute, join } from "node:path";
 
-import { inject } from "../platform/file-system";
-import { extendDebug } from "../debug";
+import { inject } from "../file-system";
+import { extendDebug } from "../../debug";
 
 const debug = extendDebug("fs");
 

packages/realm/src/node/index.ts → packages/realm/src/platform/node/index.ts

@@ -19,6 +19,6 @@
 import "./fs";
 import "./device-info";
 
-export * from "../index";
-import { Realm } from "../index";
+export * from "../../index";
+import { Realm } from "../../index";
 export default Realm;

packages/realm/src/platform/node/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "types": ["node"],
+    "noResolve": false,
+    "incremental": true,
+    "resolveJsonModule": true,
+    "paths": {
+      "realm/binding": ["./generated/ts/native-node.mjs"],
+      "realm/binding/core": ["./generated/ts/core.ts"]
+    }
+  },
+  "exclude": [
+    "../../tests/",
+    "../react-native/",
+    "../../../type-tests/"
+  ],
+}

packages/realm/src/react-native/device-info.ts → packages/realm/src/platform/react-native/device-info.ts

@@ -20,8 +20,8 @@ import { Platform } from "react-native";
 
 import { version } from "realm/package.json";
 
-import { inject } from "../platform/device-info";
-import { JsPlatformHelpers } from "../binding";
+import { inject } from "../device-info";
+import { JsPlatformHelpers } from "../../binding";
 
 function getDeviceName() {
   if (Platform.OS === "ios") {

packages/realm/src/react-native/fs.ts → packages/realm/src/platform/react-native/fs.ts

@@ -17,9 +17,9 @@
 ////////////////////////////////////////////////////////////////////////////
 import { isAbsolute, join } from "path-browserify";
 
-import { inject } from "../platform/file-system";
-import { extendDebug } from "../debug";
-import { Helpers, JsPlatformHelpers } from "../binding";
+import { inject } from "../file-system";
+import { extendDebug } from "../../debug";
+import { Helpers, JsPlatformHelpers } from "../../binding";
 
 const debug = extendDebug("fs");
 

packages/realm/src/react-native/index.ts → packages/realm/src/platform/react-native/index.ts

@@ -18,6 +18,6 @@
 import "./fs";
 import "./device-info";
 
-export * from "../index";
-import { Realm } from "../index";
+export * from "../../index";
+import { Realm } from "../../index";
 export default Realm;

packages/realm/src/platform/react-native/tsconfig.json

@@ -0,0 +1,21 @@
+{
+  "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "noResolve": false,
+    "incremental": true,
+    "resolveJsonModule": true,
+    "types": [
+      "react-native",
+      "path-browserify"
+    ],
+    "paths": {
+      "realm/binding": ["./generated/ts/native-react-native.mjs"],
+      "realm/binding/core": ["./generated/ts/core.ts"]
+    }
+  },
+  "exclude": [
+    "../../tests/",
+    "../node/",
+    "../../../type-tests/"
+  ],
+}