@quatrain/backend-sqlite 1.1.2 → 1.1.4

package/dist/SQLiteAdapter.js

@@ -166,7 +166,7 @@ class SQLiteAdapter extends backend_1.AbstractBackendAdapter {
                     else if (propDef.constructor.name === 'ObjectProperty') {
                         columnType = 'TEXT'; // Store reference ID
                     }
-                    query += `,\n${propName} ${columnType}`;
+                    query += `,\n"${propName}" ${columnType}`;
                 });
                 query += `)`;
                 yield db.exec(query);
@@ -190,8 +190,10 @@ class SQLiteAdapter extends backend_1.AbstractBackendAdapter {
                     const uid = desiredUid || (0, crypto_1.randomUUID)();
                     // Make sure table exists
                     yield this._ensureTable(dataObject);
+                    // Set uid before middlewares so they can use it
+                    dataObject.uri.path = this._buildPath(dataObject, uid);
                     // execute middlewares
-                    yield this.executeMiddlewares(dataObject, backend_1.BackendAction.CREATE, {
+                    yield this.executeMiddlewares(dataObject, backend_1.BackendAction.CREATE, 'before', {
                         useDateFormat: true,
                     });
                     const data = dataObject.toJSON({
@@ -222,10 +224,13 @@ class SQLiteAdapter extends backend_1.AbstractBackendAdapter {
                     backend_1.Backend.debug(`[SQLA] ${query}`);
                     backend_1.Backend.debug(`[SQLA] Values ${JSON.stringify(values)}`);
                     yield db.run(query, values);
-                    dataObject.uri.path = this._buildPath(dataObject, uid);
+                    // uri.path is already set before middlewares
                     dataObject.uri.label = data && Reflect.get(data, 'name');
                     dataObject.isPersisted(true);
                     backend_1.Backend.info(`[SQLA] Saved object "${data.name}" at path ${dataObject.path}`);
+                    yield this.executeMiddlewares(dataObject, backend_1.BackendAction.CREATE, 'after', {
+                        useDateFormat: true,
+                    });
                     resolve(dataObject);
                 }
                 catch (err) {
@@ -296,6 +301,7 @@ class SQLiteAdapter extends backend_1.AbstractBackendAdapter {
                 }
             }
             dataObject.populate(result);
+            yield this.executeMiddlewares(dataObject, backend_1.BackendAction.READ, 'after');
             return dataObject;
         });
     }
@@ -306,7 +312,7 @@ class SQLiteAdapter extends backend_1.AbstractBackendAdapter {
             }
             backend_1.Backend.info(`[SQLA] Updating document ${dataObject.path}`);
             // execute middlewares
-            yield this.executeMiddlewares(dataObject, backend_1.BackendAction.UPDATE);
+            yield this.executeMiddlewares(dataObject, backend_1.BackendAction.UPDATE, 'before');
             const data = dataObject.toJSON({
                 withoutURIData: true,
                 ignoreUnchanged: true,
@@ -341,6 +347,7 @@ class SQLiteAdapter extends backend_1.AbstractBackendAdapter {
             backend_1.Backend.debug(`[SQLA] ${query}`);
             backend_1.Backend.debug(`[SQLA] Values ${JSON.stringify(values)}`);
             yield db.run(query, values);
+            yield this.executeMiddlewares(dataObject, backend_1.BackendAction.UPDATE, 'after');
             return dataObject;
         });
     }
@@ -354,7 +361,7 @@ class SQLiteAdapter extends backend_1.AbstractBackendAdapter {
                 throw new backend_1.BackendError(`[SQLA] Cannot determine collection name`);
             }
             // execute middlewares
-            yield this.executeMiddlewares(dataObject, backend_1.BackendAction.DELETE, {
+            yield this.executeMiddlewares(dataObject, backend_1.BackendAction.DELETE, 'before', {
                 useDateFormat: true,
             });
             const db = yield this._connect();
@@ -368,6 +375,9 @@ class SQLiteAdapter extends backend_1.AbstractBackendAdapter {
                 ]);
             }
             dataObject.uri = new core_1.ObjectUri();
+            yield this.executeMiddlewares(dataObject, backend_1.BackendAction.DELETE, 'after', {
+                useDateFormat: true,
+            });
             return dataObject;
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quatrain/backend-sqlite",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "license": "AGPL-3.0-only",
   "description": "Backend adapter for SQLite",
   "main": "dist/index.js",
@@ -20,8 +20,8 @@
   },
   "author": "Quatrain Développement SAS <developers@quatrain.com>",
   "dependencies": {
-    "@quatrain/backend": "^1.2.1",
-    "@quatrain/core": "^1.2.2",
+    "@quatrain/backend": "^1.2.3",
+    "@quatrain/core": "^1.2.3",
     "sqlite": "^5.1.1",
     "sqlite3": "^5.1.7"
   },

package/src/SQLiteAdapter.ts

@@ -194,7 +194,7 @@ export class SQLiteAdapter extends AbstractBackendAdapter {
                   columnType = 'TEXT' // Store reference ID
                }
 
-               query += `,\n${propName} ${columnType}`
+               query += `,\n"${propName}" ${columnType}`
             }
          )
 
@@ -227,8 +227,11 @@ export class SQLiteAdapter extends AbstractBackendAdapter {
             // Make sure table exists
             await this._ensureTable(dataObject)
 
+            // Set uid before middlewares so they can use it
+            dataObject.uri.path = this._buildPath(dataObject, uid)
+
             // execute middlewares
-            await this.executeMiddlewares(dataObject, BackendAction.CREATE, {
+            await this.executeMiddlewares(dataObject, BackendAction.CREATE, 'before', {
                useDateFormat: true,
             })
 
@@ -273,7 +276,7 @@ export class SQLiteAdapter extends AbstractBackendAdapter {
 
             await db.run(query, values)
 
-            dataObject.uri.path = this._buildPath(dataObject, uid)
+            // uri.path is already set before middlewares
             dataObject.uri.label = data && Reflect.get(data, 'name')
             dataObject.isPersisted(true)
 
@@ -281,6 +284,10 @@ export class SQLiteAdapter extends AbstractBackendAdapter {
                `[SQLA] Saved object "${data.name}" at path ${dataObject.path}`
             )
 
+            await this.executeMiddlewares(dataObject, BackendAction.CREATE, 'after', {
+               useDateFormat: true,
+            })
+
             resolve(dataObject)
          } catch (err) {
             console.error(err)
@@ -373,6 +380,7 @@ export class SQLiteAdapter extends AbstractBackendAdapter {
       }
 
       dataObject.populate(result)
+      await this.executeMiddlewares(dataObject, BackendAction.READ, 'after')
       return dataObject
    }
 
@@ -386,7 +394,7 @@ export class SQLiteAdapter extends AbstractBackendAdapter {
       Backend.info(`[SQLA] Updating document ${dataObject.path}`)
 
       // execute middlewares
-      await this.executeMiddlewares(dataObject, BackendAction.UPDATE)
+      await this.executeMiddlewares(dataObject, BackendAction.UPDATE, 'before')
 
       const data = dataObject.toJSON({
          withoutURIData: true,
@@ -439,6 +447,8 @@ export class SQLiteAdapter extends AbstractBackendAdapter {
       Backend.debug(`[SQLA] Values ${JSON.stringify(values)}`)
 
       await db.run(query, values)
+      
+      await this.executeMiddlewares(dataObject, BackendAction.UPDATE, 'after')
       return dataObject
    }
 
@@ -456,7 +466,7 @@ export class SQLiteAdapter extends AbstractBackendAdapter {
       }
 
       // execute middlewares
-      await this.executeMiddlewares(dataObject, BackendAction.DELETE, {
+      await this.executeMiddlewares(dataObject, BackendAction.DELETE, 'before', {
          useDateFormat: true,
       })
 
@@ -475,6 +485,11 @@ export class SQLiteAdapter extends AbstractBackendAdapter {
       }
 
       dataObject.uri = new ObjectUri()
+
+      await this.executeMiddlewares(dataObject, BackendAction.DELETE, 'after', {
+         useDateFormat: true,
+      })
+
       return dataObject
    }