thatcher 1.0.36 → 1.0.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thatcher",
-  "version": "1.0.36",
+  "version": "1.0.38",
   "description": "A config-driven application framework for building data-intensive web apps without code.",
   "main": "src/index.js",
   "type": "module",
@@ -54,7 +54,7 @@
     "busybase": "^1.0.2",
     "googleapis": "^173.0.0",
     "hyperformula": "^3.2.0",
-    "js-yaml": "^4.1.1",
+    "js-yaml": "^5.2.1",
     "lucia": "^3.2.2",
     "nodemailer": "^9.0.1",
     "webjsx": "^0.0.73",

package/src/config/config-loader.js

@@ -2,7 +2,7 @@
 
 import fs from 'fs';
 import path from 'path';
-import yaml from 'js-yaml';
+import { load as yamlLoad } from 'js-yaml';
 
 export async function loadConfig(configSource) {
   let config;
@@ -13,7 +13,7 @@ export async function loadConfig(configSource) {
       throw new Error(`Configuration file not found: ${configPath}`);
     }
     const content = fs.readFileSync(configPath, 'utf-8');
-    config = yaml.load(content);
+    config = yamlLoad(content);
   } else if (typeof configSource === 'object') {
     config = configSource;
   } else {

package/src/index.js

@@ -82,8 +82,8 @@ export class Thatcher {
         throw new Error(`Configuration file not found: ${configPath}`);
       }
       const content = fs.readFileSync(configPath, 'utf-8');
-      const { default: yaml } = await import('js-yaml');
-      masterConfig = yaml.load(content);
+      const { load: yamlLoad } = await import('js-yaml');
+      masterConfig = yamlLoad(content);
     } else if (typeof config === 'object') {
       masterConfig = config;
     } else {
@@ -96,8 +96,8 @@ export class Thatcher {
         if (fs.existsSync(p)) {
           this.options.config = p;
           const content = fs.readFileSync(p, 'utf-8');
-          const { default: yaml } = await import('js-yaml');
-          masterConfig = yaml.load(content);
+          const { load: yamlLoad } = await import('js-yaml');
+          masterConfig = yamlLoad(content);
           break;
         }
       }
@@ -284,9 +284,15 @@ export class Thatcher {
     return create(entity, data, user);
   }
 
-  async update(entity, id, data, user) {
+  // opts.expectedVersion: optional optimistic-concurrency guard (see
+  // busybase-store.js update()) -- a caller that read the row's _version can
+  // pass it here to detect (via a thrown {code:'conflict'} error) a concurrent
+  // writer landing in between, instead of silently clobbering it. `user` stays
+  // its own positional param (unused by the store today, kept for API
+  // stability with existing callers); opts is a new, optional 5th param.
+  async update(entity, id, data, user, opts = {}) {
     const { update } = await import(resolveModule('./lib/busybase-store.js'));
-    return update(entity, id, data, user);
+    return update(entity, id, data, opts);
   }
 
   async delete(entity, id) {

package/src/lib/config-generator-engine.js

@@ -1,6 +1,6 @@
 // Adapted from moonlanding/src/lib/config-generator-engine.js
 
-import yaml from 'js-yaml';
+import { load as yamlLoad } from 'js-yaml';
 import { LRUCache, deepFreeze, deepClone, recursiveResolve } from './config-helpers.js';
 import { generateFieldsFromOverrides, ensureFieldLabels } from './config-field-helpers.js';