@airoom/nextmin-node 2.0.1 → 2.0.3

package/dist/utils/SchemaLoader.js

@@ -58,6 +58,10 @@ function validateSchema(obj) {
     return missing;
 }
 class SchemaLoader {
+    get isDevelopment() {
+        return (process.env.APP_MODE?.toLowerCase() !== 'production' &&
+            process.env.NODE_ENV?.toLowerCase() !== 'production');
+    }
     // Singleton instance
     static getInstance() {
         if (!SchemaLoader._instance) {
@@ -68,10 +72,8 @@ class SchemaLoader {
     constructor() {
         this.emitter = new events_1.EventEmitter();
         this.schemas = {};
-        this.isDevelopment = false;
-        this.nonOverridableSchemas = new Set(['User', 'Role']);
+        this.nonOverridableSchemas = new Set(['Users', 'Roles']);
         this.watcher = null; // <-- TS-safe
-        this.isDevelopment = process.env.APP_MODE !== 'production';
         const baseDir = process.cwd();
         const basePackageDir = path_1.default.resolve(__dirname, '..');
         this.packageSchemasDir = path_1.default.join(basePackageDir, 'schemas');
@@ -275,7 +277,7 @@ class SchemaLoader {
                         // Instead of blocking, MERGE user changes into package default
                         const base = schemas[modelName];
                         if (base) {
-                            // shallow merge + attributes deep merge with delete support
+                            // shallow merge + attributes deep merge with delete support + deep access merge
                             const merged = {
                                 ...base,
                                 ...schema,
@@ -284,6 +286,42 @@ class SchemaLoader {
                                     ...base.allowedMethods,
                                     ...schema.allowedMethods,
                                 },
+                                access: base.access || schema.access ? {
+                                    ...(base.access || {}),
+                                    ...(schema.access || {}),
+                                    public: {
+                                        ...(base.access?.public || {}),
+                                        ...(schema.access?.public || {}),
+                                    },
+                                    authenticated: {
+                                        ...(base.access?.authenticated || {}),
+                                        ...(schema.access?.authenticated || {}),
+                                    },
+                                    roles: {
+                                        ...(base.access?.roles || {}),
+                                        ...(schema.access?.roles || {}),
+                                    },
+                                    queryFilter: {
+                                        ...(base.access?.queryFilter || {}),
+                                        ...(schema.access?.queryFilter || {}),
+                                    },
+                                    createDefaults: {
+                                        ...(base.access?.createDefaults || {}),
+                                        ...(schema.access?.createDefaults || {}),
+                                    },
+                                    restrictions: {
+                                        ...(base.access?.restrictions || {}),
+                                        ...(schema.access?.restrictions || {}),
+                                    },
+                                    bypassPrivacy: base.access?.bypassPrivacy || schema.access?.bypassPrivacy ? {
+                                        ...(base.access?.bypassPrivacy || {}),
+                                        ...(schema.access?.bypassPrivacy || {}),
+                                        roles: Array.from(new Set([
+                                            ...(base.access?.bypassPrivacy?.roles || []),
+                                            ...(schema.access?.bypassPrivacy?.roles || [])
+                                        ]))
+                                    } : undefined
+                                } : undefined
                             };
                             schemas[modelName] = merged;
                         }
@@ -395,9 +433,9 @@ class SchemaLoader {
         }
         return out;
     }
-    closeWatcher() {
+    async closeWatcher() {
         if (this.watcher) {
-            this.watcher.close();
+            await this.watcher.close();
         }
     }
     coerceIndexDir(val) {

package/package.json

@@ -1,11 +1,16 @@
 {
   "name": "@airoom/nextmin-node",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "bin": {
+    "nextmin-node": "./dist/cli.js",
+    "nextmin": "./dist/cli.js",
+    "netmin": "./dist/cli.js"
+  },
   "scripts": {
-    "build": "rm -rf dist && tsc --project tsconfig.json && copyfiles -u 2 \"src/schemas/**/*\" dist/schemas",
+    "build": "rm -rf dist && tsc --project tsconfig.json && copyfiles -u 2 \"src/schemas/**/*\" dist/schemas && chmod +x dist/cli.js",
     "watch": "tsc --project tsconfig.json --watch",
     "test": "vitest run",
     "test:watch": "vitest",
@@ -15,22 +20,25 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.864.0",
     "@aws-sdk/s3-request-presigner": "^3.864.0",
+    "@keyv/redis": "^4.0.1",
     "bcrypt": "^6.0.0",
     "body-parser": "^2.2.0",
     "chokidar": "^4.0.3",
+    "dotenv": "^16.4.5",
     "fast-glob": "^3.3.1",
     "jsonwebtoken": "^9.0.2",
     "keyv": "^5.2.3",
     "kleur": "^4.1.5",
-    "@keyv/redis": "^4.0.1",
     "mongodb": "^6.21.0",
     "mongoose": "^8.18.0",
     "mongoose-autopopulate": "^1.1.0",
     "mssql": "^12.2.0",
     "multer": "^2.0.2",
     "mysql2": "^3.16.1",
+    "node-llama-cpp": "^3.18.1",
     "pg": "^8.17.2",
     "reflect-metadata": "^0.2.2",
+    "sharp": "^0.33.5",
     "socket.io": "^4.7.5",
     "sqlite3": "^5.1.7",
     "typeorm": "^0.3.28"
@@ -57,4 +65,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}