Fix module system

Author: tshemsedinov

Pragmatic/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

Server/static/404.html Pragmatic/static/404.htmlServer/static/404.html renamed to Pragmatic/static/404.html

@@ -1,4 +1,4 @@
-import { Repository, Database } from './storage.js';
+import { Database } from './storage.js';
 
 class Logger {
   #output;
@@ -19,11 +19,11 @@ class Logger {
 }
 
 const logger = new Logger('output');
-const db = await new Database('Example', 1, [
-  { name: 'user', options: { keyPath: 'id', autoIncrement: true } },
-]);
-
-const repo = db.getRepo('user');
+const schemas = {
+  user: { keyPath: 'id', autoIncrement: true },
+};
+const db = await new Database('Example', 1, schemas);
+const repo = db.getStore('user');
 
 const actions = {
   add: async () => {

Server/static/application.js Pragmatic/static/application.jsServer/static/application.js renamed to Pragmatic/static/application.js

@@ -1,7 +1,8 @@
 class Repository {
-  constructor(db, store) {
-    this.db = db;
+  constructor(store, db, schema) {
     this.store = store;
+    this.db = db;
+    this.schema = schema;
   }
 
   insert(record) {
@@ -38,16 +39,19 @@ class Repository {
 
   static #order(arr, order) {
     if (!order) return arr;
-    const [field, dir] = order.split(' ');
+    const [field, dir = 'asc'] = order.split(' ');
     const sign = dir === 'desc' ? -1 : 1;
-    return [...arr].sort((a, b) => (a[field] > b[field] ? 1 : -1) * sign);
+    return [...arr].sort((a, b) => {
+      if (a[field] === b[field]) return 0;
+      return a[field] > b[field] ? sign : -sign;
+    });
   }
 
   get({ id }) {
     return this.db.execute(this.store, 'readonly', (store) => {
       const req = store.get(id);
       return new Promise((resolve, reject) => {
-        req.onerror = () => reject(req.error || new Error(`Cen't get ${id}`));
+        req.onerror = () => reject(req.error || new Error(`Can't get ${id}`));
         req.onsuccess = () => resolve(req.result);
       });
     });
@@ -67,46 +71,56 @@ class Repository {
 class Database {
   #name;
   #version;
-  #entities;
+  #schemas;
   #instance;
   #active = false;
-  #repositories = new Map();
+  #stores = new Map();
 
-  constructor(name, version, entities) {
+  constructor(name, version, schemas) {
     this.#name = name;
     this.#version = version;
-    this.#entities = entities;
-    return this.#connect();
+    this.#schemas = schemas;
+    return this.#open();
+  }
+
+  async #open() {
+    await this.#connect();
+    await this.#init();
+    return this;
   }
 
   async #connect() {
     this.#instance = await new Promise((resolve, reject) => {
       const request = indexedDB.open(this.#name, this.#version);
       request.onupgradeneeded = (event) => this.#upgrade(event);
-      request.onsuccess = () => {
+      request.onsuccess = (event) => {
         this.#active = true;
-        resolve(request.result);
+        resolve(event.target.result);
+      };
+      request.onerror = (event) => {
+        reject(event.target.error || new Error('IndexedDB open error'));
       };
-      request.onerror = () =>
-        reject(request.error || new Error('IndexedDB open error'));
     });
-    for (const { name } of this.#entities) {
-      this.#repositories.set(name, new Repository(this, name));
+  }
+
+  #init() {
+    for (const [name, schema] of Object.entries(this.#schemas)) {
+      const store = new Repository(name, this, schema);
+      this.#stores.set(name, store);
     }
-    return this;
   }
 
   #upgrade(event) {
     const db = event.target.result;
-    for (const { name, options } of this.#entities) {
+    for (const [name, schema] of Object.entries(this.#schemas)) {
       if (!db.objectStoreNames.contains(name)) {
-        db.createObjectStore(name, options);
+        db.createObjectStore(name, schema);
       }
     }
   }
 
-  getRepo(name) {
-    return this.#repositories.get(name);
+  getStore(name) {
+    return this.#stores.get(name);
   }
 
   async execute(storeName, mode, operation) {

Server/static/favicon.ico Pragmatic/static/favicon.icoServer/static/favicon.ico renamed to Pragmatic/static/favicon.ico

@@ -4,10 +4,10 @@ import 'fake-indexeddb/auto';
 import { Database } from '../static/storage.js';
 
 test('Database connects and exposes repository', async () => {
-  const entities = [
-    { name: 'user', options: { keyPath: 'id', autoIncrement: true } }
-  ];
+  const entities = {
+    user: { keyPath: 'id', autoIncrement: true },
+  };
   const db = await new Database('TestDatabase', 1, entities);
-  const repo = db.getRepo('user');
-  assert.ok(repo);
+  const user = db.getStore('user');
+  assert.ok(user);
 });

Server/static/index.html Pragmatic/static/index.htmlServer/static/index.html renamed to Pragmatic/static/index.html

@@ -0,0 +1,31 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import 'fake-indexeddb/auto';
+import { Database } from '../static/storage.js';
+
+test('Repository performs basic CRUD', async () => {
+  const schemas = {
+    user: { keyPath: 'id', autoIncrement: true },
+  };
+  const db = await new Database('TestDatabase', 1, schemas);
+  const user = db.getStore('user');
+
+  await user.insert({ name: 'Alice', age: 30 });
+  await user.insert({ name: 'Bob', age: 20 });
+
+  const users = await user.select();
+  assert.equal(users.length, 2);
+
+  const record = await user.get({ id: 1 });
+  assert.equal(record.name, 'Alice');
+
+  record.age++;
+  await user.update(record);
+
+  const updated = await user.get({ id: 1 });
+  assert.equal(updated.age, 31);
+
+  await user.delete({ id: 2 });
+  const remaining = await user.select();
+  assert.equal(remaining.length, 1);
+});

Server/static/storage.js Pragmatic/static/storage.jsServer/static/storage.js renamed to Pragmatic/static/storage.js

@@ -3,7 +3,9 @@
 ## Quick start
 
 1. Install dependencies `npm i`
-2. Start server `node server.js` from `./Server`
+2. Start server
+  - Usage: `node server <folder>`
+  - Example: `node server Pragmatic`
 3. Open in browser: [http://127.0.0.1:8000/](http://127.0.0.1:8000/)
 
 ## License & Contributors