@stonyx/orm 0.2.1-alpha.2 → 0.2.1-alpha.21

package/src/store.js

@@ -1,5 +1,6 @@
-import { relationships } from '@stonyx/orm';
+import Orm, { relationships } from '@stonyx/orm';
 import { TYPES } from './relationships.js';
+import ViewResolver from './view-resolver.js';
 
 export default class Store {
   constructor() {
@@ -9,17 +10,145 @@ export default class Store {
     this.data = new Map();
   }
 
+  /**
+   * Synchronous memory-only access.
+   * Returns the record if it exists in the in-memory store, undefined otherwise.
+   * Does NOT query the database. For memory:false models, use find() instead.
+   */
   get(key, id) {
     if (!id) return this.data.get(key);
 
     return this.data.get(key)?.get(id);
   }
 
+  /**
+   * Async authoritative read. Always queries MySQL for memory: false models.
+   * For memory: true models, returns from store (already loaded on boot).
+   * @param {string} modelName - The model name
+   * @param {string|number} id - The record ID
+   * @returns {Promise<Record|undefined>}
+   */
+  async find(modelName, id) {
+    // For views in non-MySQL mode, use view resolver
+    if (Orm.instance?.isView?.(modelName) && !this._mysqlDb) {
+      const resolver = new ViewResolver(modelName);
+      return resolver.resolveOne(id);
+    }
+
+    // For memory: true models, the store is authoritative
+    if (this._isMemoryModel(modelName)) {
+      return this.get(modelName, id);
+    }
+
+    // For memory: false models, always query MySQL
+    if (this._mysqlDb) {
+      return this._mysqlDb.findRecord(modelName, id);
+    }
+
+    // Fallback to store (JSON mode or no MySQL)
+    return this.get(modelName, id);
+  }
+
+  /**
+   * Async read for all records of a model. Always queries MySQL for memory: false models.
+   * For memory: true models, returns from store.
+   * @param {string} modelName - The model name
+   * @param {Object} [conditions] - Optional WHERE conditions
+   * @returns {Promise<Record[]>}
+   */
+  async findAll(modelName, conditions) {
+    // For views in non-MySQL mode, use view resolver
+    if (Orm.instance?.isView?.(modelName) && !this._mysqlDb) {
+      const resolver = new ViewResolver(modelName);
+      const records = await resolver.resolveAll();
+
+      if (!conditions || Object.keys(conditions).length === 0) return records;
+
+      return records.filter(record =>
+        Object.entries(conditions).every(([key, value]) => record.__data[key] === value)
+      );
+    }
+
+    // For memory: true models without conditions, return from store
+    if (this._isMemoryModel(modelName) && !conditions) {
+      const modelStore = this.get(modelName);
+      return modelStore ? Array.from(modelStore.values()) : [];
+    }
+
+    // For memory: false models (or filtered queries), always query MySQL
+    if (this._mysqlDb) {
+      return this._mysqlDb.findAll(modelName, conditions);
+    }
+
+    // Fallback to store (JSON mode) — apply conditions in-memory if provided
+    const modelStore = this.get(modelName);
+    if (!modelStore) return [];
+
+    const records = Array.from(modelStore.values());
+
+    if (!conditions || Object.keys(conditions).length === 0) return records;
+
+    return records.filter(record =>
+      Object.entries(conditions).every(([key, value]) => record.__data[key] === value)
+    );
+  }
+
+  /**
+   * Async query — always hits MySQL, never reads from memory cache.
+   * Use for complex queries, aggregations, or when you need guaranteed freshness.
+   * @param {string} modelName - The model name
+   * @param {Object} conditions - WHERE conditions
+   * @returns {Promise<Record[]>}
+   */
+  async query(modelName, conditions = {}) {
+    if (this._mysqlDb) {
+      return this._mysqlDb.findAll(modelName, conditions);
+    }
+
+    // Fallback: filter in-memory store
+    const modelStore = this.get(modelName);
+    if (!modelStore) return [];
+
+    const records = Array.from(modelStore.values());
+
+    if (Object.keys(conditions).length === 0) return records;
+
+    return records.filter(record =>
+      Object.entries(conditions).every(([key, value]) => record.__data[key] === value)
+    );
+  }
+
+  /**
+   * Set by Orm during init — resolves memory flag for a model name.
+   * @type {Function|null}
+   */
+  _memoryResolver = null;
+
+  /**
+   * Set by Orm during init — reference to the MysqlDB instance for on-demand queries.
+   * @type {MysqlDB|null}
+   */
+  _mysqlDb = null;
+
+  /**
+   * Check if a model is configured for in-memory storage.
+   * @private
+   */
+  _isMemoryModel(modelName) {
+    if (this._memoryResolver) return this._memoryResolver(modelName);
+    return true; // default to memory if resolver not set yet
+  }
+
   set(key, value) {
     this.data.set(key, value);
   }
 
   remove(key, id) {
+    // Guard: read-only views cannot have records removed
+    if (Orm.instance?.isView?.(key)) {
+      throw new Error(`Cannot remove records from read-only view '${key}'`);
+    }
+
     if (id) return this.unloadRecord(key, id);
 
     this.unloadAllRecords(key);

package/src/utils.js

@@ -1,10 +1,10 @@
 import { pluralize as basePluralize } from '@stonyx/utils/string';
 
+// Wrapper to handle dasherized model names (e.g., "access-link" → "access-links")
 export function pluralize(word) {
   if (word.includes('-')) {
     const parts = word.split('-');
     const pluralizedLast = basePluralize(parts.pop());
-
     return [...parts, pluralizedLast].join('-');
   }
 

package/src/view-resolver.js

@@ -0,0 +1,183 @@
+import Orm, { createRecord, store } from '@stonyx/orm';
+import { AggregateProperty } from './aggregates.js';
+import { get } from '@stonyx/utils/object';
+
+export default class ViewResolver {
+  constructor(viewName) {
+    this.viewName = viewName;
+  }
+
+  async resolveAll() {
+    const orm = Orm.instance;
+    const { modelClass: viewClass } = orm.getRecordClasses(this.viewName);
+
+    if (!viewClass) return [];
+
+    const source = viewClass.source;
+    if (!source) return [];
+
+    const sourceRecords = await store.findAll(source);
+    if (!sourceRecords || sourceRecords.length === 0) {
+      return [];
+    }
+
+    const resolveMap = viewClass.resolve || {};
+    const viewInstance = new viewClass(this.viewName);
+    const aggregateFields = {};
+    const regularFields = {};
+
+    // Categorize fields on the view instance
+    for (const [key, value] of Object.entries(viewInstance)) {
+      if (key.startsWith('__')) continue;
+      if (key === 'id') continue;
+
+      if (value instanceof AggregateProperty) {
+        aggregateFields[key] = value;
+      } else if (typeof value !== 'function') {
+        // Regular attr or direct value — not a relationship handler
+        regularFields[key] = value;
+      }
+    }
+
+    const groupByField = viewClass.groupBy;
+
+    if (groupByField) {
+      return this._resolveGroupBy(sourceRecords, groupByField, aggregateFields, regularFields, resolveMap, viewClass);
+    }
+
+    return this._resolvePerRecord(sourceRecords, aggregateFields, regularFields, resolveMap, viewClass);
+  }
+
+  _resolvePerRecord(sourceRecords, aggregateFields, regularFields, resolveMap, viewClass) {
+    const results = [];
+
+    for (const sourceRecord of sourceRecords) {
+      const rawData = { id: sourceRecord.id };
+
+      // Compute aggregate fields from source record's relationships
+      for (const [key, aggProp] of Object.entries(aggregateFields)) {
+        const relatedRecords = sourceRecord.__relationships?.[aggProp.relationship]
+          || sourceRecord[aggProp.relationship];
+        const relArray = Array.isArray(relatedRecords) ? relatedRecords : [];
+        rawData[key] = aggProp.compute(relArray);
+      }
+
+      // Apply resolve map entries
+      for (const [key, resolver] of Object.entries(resolveMap)) {
+        if (typeof resolver === 'function') {
+          rawData[key] = resolver(sourceRecord);
+        } else if (typeof resolver === 'string') {
+          rawData[key] = get(sourceRecord.__data || sourceRecord, resolver)
+            ?? get(sourceRecord, resolver);
+        }
+      }
+
+      // Map regular attr fields from source record if not already set
+      for (const key of Object.keys(regularFields)) {
+        if (rawData[key] !== undefined) continue;
+
+        const sourceValue = sourceRecord.__data?.[key] ?? sourceRecord[key];
+        if (sourceValue !== undefined) {
+          rawData[key] = sourceValue;
+        }
+      }
+
+      // Set belongsTo source relationship
+      const viewInstanceForRel = new viewClass(this.viewName);
+      for (const [key, value] of Object.entries(viewInstanceForRel)) {
+        if (typeof value === 'function' && key !== 'id') {
+          // This is a relationship handler — pass the source record id
+          rawData[key] = sourceRecord.id;
+        }
+      }
+
+      // Clear existing record from store to allow re-resolution
+      const viewStore = store.get(this.viewName);
+      if (viewStore?.has(rawData.id)) {
+        viewStore.delete(rawData.id);
+      }
+
+      const record = createRecord(this.viewName, rawData, { isDbRecord: true });
+      results.push(record);
+    }
+
+    return results;
+  }
+
+  _resolveGroupBy(sourceRecords, groupByField, aggregateFields, regularFields, resolveMap, viewClass) {
+    // Group source records by the groupBy field value
+    const groups = new Map();
+    for (const record of sourceRecords) {
+      const key = record.__data?.[groupByField] ?? record[groupByField];
+      if (!groups.has(key)) {
+        groups.set(key, []);
+      }
+      groups.get(key).push(record);
+    }
+
+    const results = [];
+
+    for (const [groupKey, groupRecords] of groups) {
+      const rawData = { id: groupKey };
+
+      // Compute aggregate fields
+      for (const [key, aggProp] of Object.entries(aggregateFields)) {
+        if (aggProp.relationship === undefined) {
+          // Field-level aggregate — compute over group records directly
+          rawData[key] = aggProp.compute(groupRecords);
+        } else {
+          // Relationship aggregate — flatten related records across all group members
+          const allRelated = [];
+          for (const record of groupRecords) {
+            const relatedRecords = record.__relationships?.[aggProp.relationship]
+              || record[aggProp.relationship];
+            if (Array.isArray(relatedRecords)) {
+              allRelated.push(...relatedRecords);
+            }
+          }
+          rawData[key] = aggProp.compute(allRelated);
+        }
+      }
+
+      // Apply resolve map entries — functions receive the group array
+      for (const [key, resolver] of Object.entries(resolveMap)) {
+        if (typeof resolver === 'function') {
+          rawData[key] = resolver(groupRecords);
+        } else if (typeof resolver === 'string') {
+          // String path — take value from first record in group
+          const first = groupRecords[0];
+          rawData[key] = get(first.__data || first, resolver)
+            ?? get(first, resolver);
+        }
+      }
+
+      // Map regular attr fields from first record if not already set
+      for (const key of Object.keys(regularFields)) {
+        if (rawData[key] !== undefined) continue;
+        const first = groupRecords[0];
+        const sourceValue = first.__data?.[key] ?? first[key];
+        if (sourceValue !== undefined) {
+          rawData[key] = sourceValue;
+        }
+      }
+
+      // Clear existing record from store to allow re-resolution
+      const viewStore = store.get(this.viewName);
+      if (viewStore?.has(rawData.id)) {
+        viewStore.delete(rawData.id);
+      }
+
+      const record = createRecord(this.viewName, rawData, { isDbRecord: true });
+      results.push(record);
+    }
+
+    return results;
+  }
+
+  async resolveOne(id) {
+    const all = await this.resolveAll();
+    return all.find(record => {
+      return record.id === id || record.id == id;
+    });
+  }
+}

package/src/view.js

@@ -0,0 +1,21 @@
+import { attr } from '@stonyx/orm';
+
+export default class View {
+  static memory = false;
+  static readOnly = true;
+  static pluralName = undefined;
+  static source = undefined;
+  static groupBy = undefined;
+  static resolve = undefined;
+
+  id = attr('number');
+
+  constructor(name) {
+    this.__name = name;
+
+    // Enforce readOnly — cannot be overridden to false
+    if (this.constructor.readOnly !== true) {
+      throw new Error(`View '${name}' cannot override readOnly to false`);
+    }
+  }
+}

package/test-events-setup.js

@@ -0,0 +1,41 @@
+/**
+ * Debug script to verify event setup
+ */
+
+import Stonyx from 'stonyx';
+import config from './config/environment.js';
+import Orm from './src/main.js';
+import { subscribe } from '@stonyx/events';
+
+// Override paths for tests
+Object.assign(config.paths, {
+  access: './test/sample/access',
+  model: './test/sample/models',
+  serializer: './test/sample/serializers',
+  transform: './test/sample/transforms'
+});
+
+// Override db settings for tests
+Object.assign(config.db, {
+  file: './test/sample/db.json',
+  schema: './test/sample/db-schema.js'
+});
+
+new Stonyx(config, import.meta.dirname);
+
+const orm = new Orm();
+await orm.init();
+
+console.log('ORM initialized');
+console.log('Store keys:', Array.from(Orm.store.data.keys()));
+
+// Try subscribing to an event
+try {
+  const unsubscribe = subscribe('before:create:animal', (context) => {
+    console.log('Hook called!', context);
+  });
+  console.log('✓ Successfully subscribed to before:create:animal');
+  unsubscribe();
+} catch (error) {
+  console.error('✗ Failed to subscribe:', error.message);
+}

package/test-hooks-manual.js

@@ -0,0 +1,54 @@
+/**
+ * Manual test script for hooks functionality
+ * Run with: node test-hooks-manual.js
+ */
+
+import { setup, subscribe, emit } from '@stonyx/events';
+
+console.log('Testing hooks system...\n');
+
+// Setup events
+const eventNames = ['before:create:animal', 'after:create:animal'];
+setup(eventNames);
+
+let beforeCalled = false;
+let afterCalled = false;
+let contextReceived = null;
+
+// Subscribe to hooks
+const unsubscribe1 = subscribe('before:create:animal', async (context) => {
+  console.log('✓ before:create:animal hook called');
+  console.log('  Context:', JSON.stringify(context, null, 2));
+  beforeCalled = true;
+  contextReceived = context;
+});
+
+const unsubscribe2 = subscribe('after:create:animal', async (context) => {
+  console.log('✓ after:create:animal hook called');
+  console.log('  Context:', JSON.stringify(context, null, 2));
+  afterCalled = true;
+});
+
+// Simulate hook execution
+const testContext = {
+  model: 'animal',
+  operation: 'create',
+  body: { data: { type: 'animals', attributes: { name: 'Test' } } }
+};
+
+console.log('Emitting before:create:animal...');
+await emit('before:create:animal', testContext);
+
+console.log('\nEmitting after:create:animal...');
+await emit('after:create:animal', { ...testContext, record: { id: 1, name: 'Test' } });
+
+console.log('\n--- Test Results ---');
+console.log('Before hook called:', beforeCalled ? '✓ PASS' : '✗ FAIL');
+console.log('After hook called:', afterCalled ? '✓ PASS' : '✗ FAIL');
+console.log('Context passed correctly:', contextReceived?.model === 'animal' ? '✓ PASS' : '✗ FAIL');
+
+// Cleanup
+unsubscribe1();
+unsubscribe2();
+
+console.log('\n✓ Hooks system working correctly!');

package/test-hooks-with-logging.js

@@ -0,0 +1,52 @@
+/**
+ * Test to verify hooks wrapper is being called
+ */
+
+import { emit } from '@stonyx/events';
+
+// Simulate the _withHooks wrapper
+function _withHooks(operation, handler, model) {
+  console.log(`Creating wrapper for ${operation} on ${model}`);
+
+  return async (request, state) => {
+    console.log(`Wrapper called for ${operation} on ${model}`);
+
+    const context = {
+      model,
+      operation,
+      request,
+    };
+
+    console.log(`About to emit before:${operation}:${model}`);
+    await emit(`before:${operation}:${model}`, context);
+    console.log(`Emitted before hook`);
+
+    const response = await handler(request, state);
+    console.log(`Handler completed`);
+
+    context.response = response;
+    await emit(`after:${operation}:${model}`, context);
+    console.log(`Emitted after hook`);
+
+    return response;
+  };
+}
+
+// Simulate a handler
+const createHandler = ({ body }) => {
+  console.log('Original handler called');
+  return { data: { id: 1, ...body } };
+};
+
+// Create wrapped handler
+const wrappedHandler = _withHooks('create', createHandler, 'animal');
+
+// Simulate a request
+const mockRequest = {
+  body: { name: 'Test' }
+};
+
+console.log('\n=== Testing wrapper ===');
+const result = await wrappedHandler(mockRequest, {});
+console.log('Result:', result);
+console.log('\n✓ Wrapper test completed');