@opengis/pay 1.3.1 → 1.3.2

package/config.js

@@ -1,7 +1,74 @@
-import { existsSync, readFileSync } from 'fs';
+/* eslint-disable no-console */
+import dotenv from 'dotenv';
 
-const config = existsSync('config.json') ? JSON.parse(readFileSync('config.json')) : {};
-// console.log(config);
-config.storageList = {};
+dotenv.config(); // load .env for node, not required for bun
+
+import { existsSync, readFileSync } from 'node:fs';
+
+function unflattenObject(flatObj) {
+    const res = Object.keys(flatObj || {}).reduce((acc, key) => {
+        const keys = key.split('.');
+        keys.reduce((nestedObj, part, index) => {
+            if (index === keys.length - 1) {
+                // json array
+                if (typeof flatObj[key] === 'string' && flatObj[key].startsWith('[') && flatObj[key] !== ('[object Object]')) {
+                    try {
+                        nestedObj[part] = JSON.parse(flatObj[key] || '{}');
+                    }
+                    catch (err) {
+                        console.warn(`Error parsing JSON for key ${key}:`, err.toString());
+                        nestedObj[part] = flatObj[key]; // fallback to original value if parsing fails
+                    }
+                }
+                else if (['true', 'false'].includes(flatObj[key]) || (!isNaN(flatObj[key]) && key !== 'auth.uid')) {
+                    try {
+                        nestedObj[part] = JSON.parse(flatObj[key] || '{}');
+                    }
+                    catch (err) {
+                        console.warn(`Error parsing JSON for key ${key}:`, err.toString());
+                        nestedObj[part] = flatObj[key]; // fallback to original value if parsing fails
+                    }
+                }
+                else {
+                    nestedObj[part] = flatObj[key];
+                }
+            }
+            else {
+                nestedObj[part] = nestedObj[part] || {};
+            }
+            return nestedObj[part];
+        }, acc);
+        return acc;
+    }, {});
+    console.log('unflattened');
+    return res;
+}
+
+const fileName = ['config.json', '/data/local/config.json'].find(el => (existsSync(el) ? el : null));
+const config = fileName ? JSON.parse(readFileSync(fileName)) : {};
+
+const { skipKeys = ['windir'] } = config;
+
+// npm run dev === cross-env NODE_ENV=development
+// alt: node --env=development
+Object.assign(config, {
+    storageList: {},
+    allTemplates: config?.allTemplates || {},
+    skipCheckPolicyRoutes: [],
+    env: process.env?.NODE_ENV,
+});
+
+if (process.env?.NODE_ENV && existsSync(`.env.${process.env.NODE_ENV}`)) {
+    dotenv.config({ path: `.env.${process.env.NODE_ENV}` }); // load .env.{{production}} etc. for node, not required for bun
+}
+
+function loadEnvConfig() {
+    // node --env-file-if-exists=.env.dev --env-file-if-exists=.env server
+    if (config.trace) { console.log(Object.keys(process.env)); }
+    const configKeys = Object.keys(process.env).filter(key => !key.startsWith('npm_') && !skipKeys.includes(key) && (key.charAt(0) === key.charAt(0)?.toLowerCase?.() || key.includes('.'))).reduce((acc, curr) => ({ ...acc, [curr]: process.env[curr] }), {});
+    Object.assign(config, unflattenObject(configKeys));
+}
+
+loadEnvConfig();
 
 export default config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/pay",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "type": "module",
   "description": "pay plugins for billing",
   "main": "plugin.js",
@@ -13,6 +13,7 @@
     "utils.js"
   ],
   "scripts": {
+    "patch": "npm version patch && git push && npm publish",
     "test": "node --test",
     "start": "node --watch-path=server server",
     "admin": "set NODE_ENV=admin&& npm run start",
@@ -33,4 +34,4 @@
   },
   "author": "Softpro",
   "license": "ISC"
-}
+}