Merge pull request #7 from quweifan/sig

SQL执行调整&代码格式修改

Author: ding-chengjie

NativeSQLitePlugin.ts

@@ -1,20 +1,42 @@
-import type {TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
-import {TurboModuleRegistry} from 'react-native';
+import type { TurboModule } from "react-native/Libraries/TurboModule/RCTExport";
+import { TurboModuleRegistry } from "react-native";
 
 export interface Spec extends TurboModule {
-  
-  open(openargs:Object,opensuccesscb:() => void,openerrorcb:(e:Object) => void):void;
-
-  close(closeargs:Object,mysuccess:(t:Object,r:Object) => void,myerror:(e:Object) => void):void;
-
-  attach(attachargs:Object,mysuccess:(t:Object,r:Object) => void,myerror:(e:Object) => void):void;
-
-  backgroundExecuteSqlBatch(args:Object,mysuccess:(result:Object) => void,myerror:(e:Object) => void):void;
-
-  echoStringValue(openargs:Object,mysuccess:(testValue:Object) => void,myerror:(e:Object) => void):void;
-
-  delete(args:Object,mysuccess:(r:Object) => void,myerror:(e:Object) => void):void;
-
+  open(
+    openargs: Object,
+    opensuccesscb: () => void,
+    openerrorcb: (e: Object) => void
+  ): void;
+
+  close(
+    closeargs: Object,
+    mysuccess: (t: Object, r: Object) => void,
+    myerror: (e: Object) => void
+  ): void;
+
+  attach(
+    attachargs: Object,
+    mysuccess: (t: Object, r: Object) => void,
+    myerror: (e: Object) => void
+  ): void;
+
+  backgroundExecuteSqlBatch(
+    args: Object,
+    mysuccess: (result: Object) => void,
+    myerror: (e: Object) => void
+  ): void;
+
+  echoStringValue(
+    openargs: Object,
+    mysuccess: (testValue: Object) => void,
+    myerror: (e: Object) => void
+  ): void;
+
+  delete(
+    args: Object,
+    mysuccess: (r: Object) => void,
+    myerror: (e: Object) => void
+  ): void;
 }
 
-export default TurboModuleRegistry.getEnforcing<Spec>('SQLitePlugin');
+export default TurboModuleRegistry.getEnforcing<Spec>("SQLitePlugin");

Podfile

@@ -13,7 +13,6 @@
  * See http://opensource.org/licenses/alphabetical for full text.
  */
 
-// var NativeModules = require("react-native").NativeModules;
 import NativeModules from '../NativeSQLitePlugin'
 var DB_STATE_INIT, DB_STATE_OPEN, READ_ONLY_REGEX, SQLiteFactory, SQLitePlugin, SQLitePluginTransaction, argsArray, dblocations, newSQLError, txLocks;
 
@@ -86,20 +85,19 @@ argsArray = function(fun) {
 plugin.exec = function(method, options, success, error) {
   if (plugin.sqlitePlugin.DEBUG){
     plugin.log("SQLite." + method + "(" + JSON.stringify(options) + ")");
-  }
-  // NativeModules["SQLite"][method](options,success,error);     
-  if(method=='open'){
-    NativeModules.open(options,success,error);
-  }else if(method=='close'){
-    NativeModules.close(options,success,error);
-  }else if(method=='attach'){
-    NativeModules.attach(options,success,error);
-  }else if(method=='backgroundExecuteSqlBatch'){
-    NativeModules.backgroundExecuteSqlBatch(options,success,error);
-  }else if(method=='echoStringValue'){
-    NativeModules.echoStringValue(options,success,error);
-  }else if(method=='delete'){
-    NativeModules.delete(options,success,error);
+  }   
+  if (method == 'open') {
+    NativeModules.open(options, success, error);
+  } else if (method == 'close') {
+    NativeModules.close(options, success, error);
+  } else if (method == 'attach') {
+    NativeModules.attach(options, success, error);
+  } else if (method == 'backgroundExecuteSqlBatch') {
+    NativeModules.backgroundExecuteSqlBatch(options, success, error);
+  } else if (method == 'echoStringValue') {
+    NativeModules.echoStringValue(options, success, error);
+  } else if (method == 'delete') {
+    NativeModules.delete(options, success, error);
   }
 };
 

lib/sqlite.core.js

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-oh-tpl/react-native-sqlite-storage",
-  "version": "6.0.1-0.0.16",
+  "version": "6.0.1-0.0.5",
   "description": "SQLite3 bindings for React Native (Android & iOS)",
   "overrides":{
     "@react-native/codegen": "0.74.0"
@@ -48,7 +48,6 @@
   "devDependencies": {
     "react": "18.2.0",
     "react-native": "0.74.1",
-    "react-native-windows": "^0.74.3",
-    "react-native-sqlite-storage": "^6.0.1"
+    "react-native-windows": "^0.74.3"
   }
 }

package.json

@@ -1,5 +1,5 @@
 export default class BuildProfile { 
-	static readonly HAR_VERSION = '6.0.1-0.0.1';
+	static readonly HAR_VERSION = '6.0.1-0.0.5';
 	static readonly BUILD_MODE_NAME = 'debug';
 	static readonly DEBUG = true;
 }

platforms/harmony/sqlite_storage.har

@@ -6,7 +6,7 @@
   "description": "",
   "main": "ts.ts",
   "type": "module",
-  "version": "6.0.1-0.0.1",
+  "version": "6.0.1-0.0.5",
   "dependencies": {
     "@rnoh/react-native-openharmony": "file:../react_native_openharmony",
   }

platforms/harmony/sqlite_storage/BuildProfile.ets

@@ -8,22 +8,19 @@ import CommonConstants from './CommonConstants';
 
 class SQLitePluginTurboModulesFactory extends TurboModulesFactory {
   createTurboModule(name: string): TurboModule | null {
-    Logger.debug(CommonConstants.TAG, "test--SQLitePlugin=createTurboModule>>>>>" + name);
     if (name == TM.SQLitePlugin.NAME) {
       return new SQLitePluginTurboModule(this.ctx);
     }
     return null;
   }
 
   hasTurboModule(name: string): boolean {
-    Logger.debug(CommonConstants.TAG, "test--SQLitePlugin=hasTurboModule>>>>>" + name);
     return name == TM.SQLitePlugin.NAME;
   }
 }
 
 export class SQLitePluginPackage extends RNPackage {
   createTurboModulesFactory(ctx: TurboModuleContext): TurboModulesFactory {
-    Logger.debug(CommonConstants.TAG, "test--SQLitePlugin=createTurboModulesFactory>>>>>");
     return new SQLitePluginTurboModulesFactory(ctx);
   }
 }