Merge branch 'main' into example-enable-newarch

chrispader · chrispader · commit 04b0fb8c341f · 2024-11-12T17:46:25.000+01:00
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -8,6 +8,17 @@ module.exports = {
   ],
   plugins: ['@typescript-eslint', 'prettier'],
   parser: '@typescript-eslint/parser',
+  ignorePatterns: [
+    "**/node_modules",
+    "**/lib",
+    "**/.eslintrc.js",
+    "**/.prettierrc.js",
+    "**/jest.config.js",
+    "**/babel.config.js",
+    "**/metro.config.js",
+    "**/react-native.config.js",
+    "**/tsconfig.json"
+  ],
   parserOptions: {
     project: true,
     tsconfigRootDir: __dirname,
diff --git a/bun.lockb b/bun.lockb
diff --git a/example/.eslintrc.js b/example/.eslintrc.js
@@ -2,7 +2,7 @@ module.exports = {
   root: true,
   extends: '../.eslintrc.js',
   parserOptions: {
+    project: true,
     tsconfigRootDir: __dirname,
-    project: ['./tsconfig.json'],
   },
 };
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1237,7 +1237,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-quick-sqlite (8.2.0):
+  - react-native-quick-sqlite (8.2.2):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1873,9 +1873,9 @@ SPEC CHECKSUMS:
   React-jsitracing: 52b849a77d02e2dc262a3031454c23be8dabb4d9
   React-logger: 8db32983d75dc2ad54f278f344ccb9b256e694fc
   React-Mapbuffer: 1c08607305558666fd16678b85ef135e455d5c96
-  React-microtasksnativemodule: f13f03163b6a5ec66665dfe80a0df4468bb766a6
-  react-native-quick-sqlite: f5579dc8ba5a05aec0e940f0d859eaf9316538c7
-  react-native-safe-area-context: f1fda705dfe14355f41933debb5932887e234cc5
+  React-microtasksnativemodule: 87b8de96f937faefece8afd2cb3a518321b2ef99
+  react-native-quick-sqlite: a1bbc9bc60dfa6100ed68743e40fb25e30c54303
+  react-native-safe-area-context: 851c62c48dce80ccaa5637b6aa5991a1bc36eca9
   React-nativeconfig: 57781b79e11d5af7573e6f77cbf1143b71802a6d
   React-NativeModulesApple: 7ff2e2cfb2e5fa5bdedcecf28ce37e696c6ef1e1
   React-perflogger: 8a360ccf603de6ddbe9ff8f54383146d26e6c936
diff --git a/example/package.json b/example/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-quick-sqlite-example",
-  "version": "8.1.0",
+  "version": "8.2.3",
   "private": true,
   "scripts": {
     "pods": "cd ios && RCT_NEW_ARCH_ENABLED=1 bundle exec pod install",
@@ -22,7 +22,7 @@
     "expo-status-bar": "^1.12.1",
     "react": "18.3.1",
     "react-native": "0.75.2",
-    "react-native-quick-sqlite": "workspace:*",
+    "react-native-quick-sqlite": "8.2.3",
     "react-native-safe-area-context": "^4.11.0",
     "react-native-screens": "^3.34.0",
     "reflect-metadata": "^0.1.13",
diff --git a/example/src/Database.ts b/example/src/Database.ts
@@ -50,13 +50,13 @@ export async function typeORMGetBooks() {
   return result;
 }
 
-export async function executeFailingTypeORMQuery() {
+export async function executeFailingTypeORMQuery(): Promise<QueryResult | void> {
   const bookRepository = datasource.getRepository(Book);
 
   try {
     const manualQuery = (await bookRepository.query(`
           SELECT * From UnexistingTable
-        `)) as QueryResult<Book>;
+        `)) as QueryResult;
     return manualQuery;
   } catch (e) {
     console.warn('should have cached');
diff --git a/example/src/model/Book.ts b/example/src/model/Book.ts
@@ -1,11 +1,5 @@
 import 'reflect-metadata';
-import {
-  Entity,
-  Column,
-  PrimaryGeneratedColumn,
-  OneToOne,
-  JoinColumn,
-} from 'typeorm/browser';
+import {Entity, Column, PrimaryGeneratedColumn} from 'typeorm/browser';
 import {BaseEntity} from 'typeorm';
 
 @Entity()
diff --git a/example/src/model/User.ts b/example/src/model/User.ts
@@ -20,8 +20,8 @@ export class User {
   // favoriteBook!: Book;
 
   @Column('simple-json')
-  metadata: {nickname: string};
+  metadata: {nickname: string} | undefined;
 
   @Column('blob')
-  avatar: ArrayBuffer;
+  avatar: ArrayBuffer | undefined;
 }
diff --git a/example/src/screens/BenchmarkScreen.tsx b/example/src/screens/BenchmarkScreen.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable react-native/no-inline-styles */
 import React, {useCallback, useMemo, useState} from 'react';
 import Chance from 'chance';
 import {
diff --git a/example/src/screens/UnitTestScreen.tsx b/example/src/screens/UnitTestScreen.tsx
@@ -20,6 +20,7 @@ export const UnitTestScreen: React.FC = () => {
     <ScrollView
       contentContainerStyle={[
         ScreenStyles.container,
+        // eslint-disable-next-line react-native/no-inline-styles
         {alignItems: 'flex-start'},
       ]}>
       {results.map((r, i) => {
diff --git a/example/src/tests/MochaRNAdapter.ts b/example/src/tests/MochaRNAdapter.ts
@@ -42,10 +42,10 @@ export const describe = (name: string, f: () => void): void => {
   mochaContext = prevMochaContext;
 };
 
-export const beforeEach = (f: () => void): void => {
+export const beforeEach = (f: Mocha.Func) => mochaContext.beforeEach(f);
+export const beforeEachAsync = (f: Mocha.AsyncFunc) =>
   mochaContext.beforeEach(f);
-};
 
-export const beforeAll = (f: MochaTypes.Func) => {
+export const beforeAll = (f: MochaTypes.Func) => mochaContext.beforeAll(f);
+export const beforeAllAsync = (f: MochaTypes.AsyncFunc) =>
   mochaContext.beforeAll(f);
-};
diff --git a/example/src/tests/typeorm.spec.ts b/example/src/tests/typeorm.spec.ts
@@ -1,6 +1,6 @@
 import type {Repository} from 'typeorm';
 import {DataSource} from 'typeorm';
-import {beforeAll, beforeEach, it, describe} from './MochaRNAdapter';
+import {beforeAll, it, describe, beforeEachAsync} from './MochaRNAdapter';
 import {typeORMDriver} from 'react-native-quick-sqlite';
 import {User} from '../model/User';
 import {Book} from '../model/Book';
@@ -14,7 +14,7 @@ let bookRepository: Repository<Book>;
 
 export function registerTypeORMTests() {
   describe('Typeorm tests', () => {
-    beforeAll((done: any) => {
+    beforeAll(done => {
       dataSource = new DataSource({
         type: 'react-native',
         database: 'typeormDb.sqlite',
@@ -37,12 +37,12 @@ export function registerTypeORMTests() {
         });
     });
 
-    beforeEach(async () => {
+    beforeEachAsync(async () => {
       await userRepository.clear();
       await bookRepository.clear();
     });
 
-    it('basic test', async () => {
+    it('basic test', () => {
       expect(1).to.equal(2);
     });
   });
diff --git a/example/src/tests/unitTests.spec.ts b/example/src/tests/unitTests.spec.ts
@@ -6,6 +6,7 @@ import type {
 import {beforeEach, describe, it} from './MochaRNAdapter';
 import chai from 'chai';
 import {testDb as testDbInternal, resetTestDb} from './db';
+import type {User} from '../model/User';
 
 function isError(e: unknown): e is Error {
   return e instanceof Error;
@@ -219,7 +220,8 @@ export function registerUnitTests() {
             [id],
           );
 
-          actual.push(results.rows?._array[0]?.networth);
+          const row = results.rows?._array[0] as User | undefined;
+          actual.push(row?.networth);
         });
 
         promises.push(promised);
@@ -513,7 +515,8 @@ export function registerUnitTests() {
             [id],
           );
 
-          actual.push(results.rows?._array[0]?.networth);
+          const row = results.rows?._array[0] as User | undefined;
+          actual.push(row?.networth);
         });
 
         promises.push(promised);
diff --git a/example/tsconfig.json b/example/tsconfig.json
@@ -1,9 +1,7 @@
 {
   "extends": "../tsconfig.json",
-  "include": ["src", "../package", "index.js", "app.json"],
+  "include": ["src", "index.js"],
   "compilerOptions": {
-    "paths": {
-      "react-native-quick-sqlite": ["../package/src/index"]
-    }
+    "experimentalDecorators": true
   }
 }
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "react-native-quick-sqlite-workspace",
+  "version": "8.2.3",
   "packageManager": "bun@1.1.21",
   "private": "true",
-  "version": "8.2.0",
   "workspaces": [
     "package",
     "example"
@@ -11,27 +11,31 @@
     "type": "git",
     "url": "git+https://github.com/margelo/react-native-quick-sqlite.git"
   },
+  "author": "Marc Rousavy <me@mrousavy.com> (https://github.com/mrousavy)",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/margelo/react-native-quick-sqlite/issues"
+  },
+  "homepage": "https://github.com/margelo/react-native-quick-sqlite#readme",
   "scripts": {
-    "package": "bun --cwd package",
-    "example": "bun --cwd example",
+    "bootstrap": "bun install && bun package prepare && bun example pods",
     "postinstall": "patch-package",
     "format-cpp": "./scripts/clang-format.sh",
     "typescript": "bun --filter=\"**\" typescript",
-    "lint": "bun --filter=\"**\" lint",
-    "bootstrap": "bun --filter=\"**\" install && bun typescript && bun example pods",
+    "lint": "bun package lint && bun example lint",
     "release": "release-it",
-    "clean": "rm -rf **/tsconfig.tsbuildinfo node_modules package/node_module package/lib"
+    "clean": "rm -rf **/tsconfig.tsbuildinfo node_modules package/node_module package/lib",
+    "package": "bun --cwd package",
+    "example": "bun --cwd example"
   },
-  "author": "Marc Rousavy <me@mrousavy.com> (https://github.com/mrousavy)",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/margelo/react-native-quick-sqlite/issues"
+  "dependencies": {
+    "patch-package": "^8.0.0"
   },
-  "homepage": "https://github.com/margelo/react-native-quick-sqlite#readme",
   "devDependencies": {
     "@eslint/js": "^9.10.0",
     "@jamesacarr/eslint-formatter-github-actions": "^0.2.0",
     "@react-native/eslint-config": "0.75.2",
+    "@release-it-plugins/workspaces": "^4.2.0",
     "@release-it/bumper": "^6.0.1",
     "@release-it/conventional-changelog": "^8.0.2",
     "@tsconfig/react-native": "^2.0.2",
@@ -40,13 +44,11 @@
     "eslint": "8.57.0",
     "eslint-plugin-prettier": "^5.2.1",
     "prettier": "^3.3.3",
-    "release-it": "^17.6.0",
+    "release-it": "^17.10.0",
     "typescript-eslint": "^8.6.0"
   },
   "release-it": {
-    "npm": {
-      "publish": false
-    },
+    "npm": false,
     "git": {
       "commitMessage": "chore: release ${version}",
       "tagName": "v${version}",
@@ -55,7 +57,13 @@
     "github": {
       "release": true
     },
+    "hooks": {
+      "before:init": "bun typescript && bun lint",
+      "before:bump": "bun example pods",
+      "after:bump": "bun package prepare"
+    },
     "plugins": {
+      "@release-it-plugins/workspaces": true,
       "@release-it/conventional-changelog": {
         "preset": {
           "name": "conventionalcommits",
@@ -84,17 +92,17 @@
         }
       },
       "@release-it/bumper": {
-        "out": {
-          "file": "package.json",
-          "path": [
-            "package"
-          ]
-        }
+        "out": [
+          {
+            "file": "example/package.json",
+            "path": "version"
+          },
+          {
+            "file": "example/package.json",
+            "path": "dependencies.react-native-quick-sqlite"
+          }
+        ]
       }
     }
-  },
-  "dependencies": {
-    "patch-package": "^8.0.0"
-  },
-  "package": "8.2.0"
+  }
 }
diff --git a/package/.eslintrc.js b/package/.eslintrc.js
@@ -2,7 +2,7 @@ module.exports = {
   root: true,
   extends: '../.eslintrc.js',
   parserOptions: {
+    project: true,
     tsconfigRootDir: __dirname,
-    project: ['./tsconfig.json'],
   },
 }
diff --git a/package/android/build.gradle b/package/android/build.gradle
@@ -91,6 +91,27 @@ android {
       }
     }
   }
+
+  packagingOptions {
+    excludes = [
+      "META-INF",
+      "META-INF/**",
+      "**/libc++_shared.so",
+      "**/libfbjni.so",
+      "**/libjsi.so",
+      "**/libfolly_json.so",
+      "**/libfolly_runtime.so",
+      "**/libglog.so",
+      "**/libhermes.so",
+      "**/libhermes-executor-debug.so",
+      "**/libhermes_executor.so",
+      "**/libreactnative.so",
+      "**/libreactnativejni.so",
+      "**/libturbomodulejsijni.so",
+      "**/libreact_nativemodule_core.so",
+      "**/libjscexecutor.so"
+    ]
+  }
 }
 
 repositories {
diff --git a/package/package.json b/package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-quick-sqlite",
-  "version": "8.2.0",
+  "version": "8.2.3",
   "description": "Fast SQLite for react-native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -25,8 +25,7 @@
   "scripts": {
     "typescript": "tsc --noEmit",
     "lint": "eslint \"**/*.{js,ts,tsx}\" --fix",
-    "prepare": "rm -rf lib && bun typescript && bob build",
-    "release": "bun prepare && release-it"
+    "prepare": "rm -rf lib && bun typescript && bob build"
   },
   "keywords": [
     "react-native",
@@ -84,12 +83,9 @@
   },
   "release-it": {
     "npm": {
-      "publish": true
+      "publish": true,
+      "publishPackageManager": "bun"
     },
-    "git": false,
-    "github": {
-      "release": false
-    },
-    "plugins": {}
+    "git": false
   }
 }
diff --git a/package/tsconfig.json b/package/tsconfig.json
@@ -2,9 +2,6 @@
   "extends": "../tsconfig.json",
   "include": ["src"],
   "compilerOptions": {
-    "paths": {
-      "react-native-quick-sqlite": ["./src/index"]
-    },
     "rootDir": "src"
   }
 }
diff --git a/patches/release-it+17.10.0+001+bun-support-publish.patch b/patches/release-it+17.10.0+001+bun-support-publish.patch
diff --git a/patches/release-it+17.6.0+001+bun-support.patch b/patches/release-it+17.6.0+001+bun-support.patch

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ export class User {`
`20`	`20`	`// favoriteBook!: Book;`
`21`	`21`
`22`	`22`	`@Column('simple-json')`
`23`		`- metadata: {nickname: string};`
	`23`	`+ metadata: {nickname: string} \| undefined;`
`24`	`24`
`25`	`25`	`@Column('blob')`
`26`		`- avatar: ArrayBuffer;`
	`26`	`+ avatar: ArrayBuffer \| undefined;`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/* eslint-disable react-native/no-inline-styles */`
`1`	`2`	`import React, {useCallback, useMemo, useState} from 'react';`
`2`	`3`	`import Chance from 'chance';`
`3`	`4`	`import {`