casbin 5.24.0 → 5.24.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [5.24.2](https://github.com/casbin/node-casbin/compare/v5.24.1...v5.24.2) (2023-02-24)
+
+
+### Bug Fixes
+
+* using import() to load the fs ([#435](https://github.com/casbin/node-casbin/issues/435)) ([e90a8bf](https://github.com/casbin/node-casbin/commit/e90a8bf064963dd448cfa67da5af0f9aad957999))
+
+## [5.24.1](https://github.com/casbin/node-casbin/compare/v5.24.0...v5.24.1) (2023-02-17)
+
+
+### Bug Fixes
+
+* remove lodash usage and types ([#432](https://github.com/casbin/node-casbin/issues/432)) ([9c227d5](https://github.com/casbin/node-casbin/commit/9c227d51ef3feb6f6a3d30705d2784921d85dece))
+
 # [5.24.0](https://github.com/casbin/node-casbin/compare/v5.23.2...v5.24.0) (2023-02-17)
 
 

package/lib/cjs/enforcer.js

@@ -12,6 +12,25 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.newEnforcer = exports.newEnforcerWithClass = exports.Enforcer = void 0;
 const managementEnforcer_1 = require("./managementEnforcer");
@@ -438,6 +457,25 @@ class Enforcer extends managementEnforcer_1.ManagementEnforcer {
 }
 exports.Enforcer = Enforcer;
 async function newEnforcerWithClass(enforcer, ...params) {
+    var _a;
+    // inject the FS
+    if (!persist_1.getDefaultFileSystem()) {
+        try {
+            if (typeof process !== 'undefined' && ((_a = process === null || process === void 0 ? void 0 : process.versions) === null || _a === void 0 ? void 0 : _a.node)) {
+                const fs = await Promise.resolve().then(() => __importStar(require('fs')));
+                const defaultFileSystem = {
+                    readFileSync(path, encoding) {
+                        return fs.readFileSync(path, { encoding });
+                    },
+                    writeFileSync(path, text, encoding) {
+                        return fs.writeFileSync(path, text, encoding);
+                    },
+                };
+                persist_1.setDefaultFileSystem(defaultFileSystem);
+            }
+        }
+        catch (ignored) { }
+    }
     const e = new enforcer();
     let parsedParamLen = 0;
     if (params.length >= 1) {

package/lib/cjs/frontend.js

@@ -14,7 +14,6 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.casbinJsGetPermissionForUser = void 0;
-const lodash_1 = require("lodash");
 const util_1 = require("./util");
 /**
  * Experiment!
@@ -49,7 +48,7 @@ async function casbinJsGetPermissionForUser(e, user) {
     groupPolicy.forEach((item) => {
         item.unshift('g');
     });
-    obj['p'] = lodash_1.concat(policy, groupPolicy);
+    obj['p'] = [...policy, ...groupPolicy];
     return JSON.stringify(obj);
 }
 exports.casbinJsGetPermissionForUser = casbinJsGetPermissionForUser;

package/lib/cjs/index.js

@@ -34,12 +34,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Util = void 0;
 const Util = __importStar(require("./util"));
 exports.Util = Util;
-const persist_1 = require("./persist");
 __exportStar(require("./config"), exports);
 __exportStar(require("./enforcer"), exports);
 __exportStar(require("./cachedEnforcer"), exports);
@@ -50,16 +48,3 @@ __exportStar(require("./persist"), exports);
 __exportStar(require("./rbac"), exports);
 __exportStar(require("./log"), exports);
 __exportStar(require("./frontend"), exports);
-if (typeof process !== 'undefined' && ((_a = process === null || process === void 0 ? void 0 : process.versions) === null || _a === void 0 ? void 0 : _a.node)) {
-    const requireFunc = typeof __non_webpack_require__ === 'function' ? __non_webpack_require__ : require;
-    const fs = requireFunc('fs');
-    const defaultFileSystem = {
-        readFileSync(path, encoding) {
-            return fs.readFileSync(path, { encoding });
-        },
-        writeFileSync(path, text, encoding) {
-            return fs.writeFileSync(path, text, encoding);
-        },
-    };
-    persist_1.setDefaultFileSystem(defaultFileSystem);
-}

package/lib/esm/enforcer.js

@@ -13,7 +13,7 @@
 // limitations under the License.
 import { ManagementEnforcer } from './managementEnforcer';
 import { newModelFromFile } from './model';
-import { FileAdapter, StringAdapter } from './persist';
+import { FileAdapter, getDefaultFileSystem, setDefaultFileSystem, StringAdapter } from './persist';
 import { getLogger } from './log';
 import { arrayRemoveDuplicates } from './util';
 /**
@@ -434,6 +434,25 @@ export class Enforcer extends ManagementEnforcer {
     }
 }
 export async function newEnforcerWithClass(enforcer, ...params) {
+    var _a;
+    // inject the FS
+    if (!getDefaultFileSystem()) {
+        try {
+            if (typeof process !== 'undefined' && ((_a = process === null || process === void 0 ? void 0 : process.versions) === null || _a === void 0 ? void 0 : _a.node)) {
+                const fs = await import('fs');
+                const defaultFileSystem = {
+                    readFileSync(path, encoding) {
+                        return fs.readFileSync(path, { encoding });
+                    },
+                    writeFileSync(path, text, encoding) {
+                        return fs.writeFileSync(path, text, encoding);
+                    },
+                };
+                setDefaultFileSystem(defaultFileSystem);
+            }
+        }
+        catch (ignored) { }
+    }
     const e = new enforcer();
     let parsedParamLen = 0;
     if (params.length >= 1) {

package/lib/esm/frontend.js

@@ -11,7 +11,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import { concat } from 'lodash';
 import { deepCopy } from './util';
 /**
  * Experiment!
@@ -46,6 +45,6 @@ export async function casbinJsGetPermissionForUser(e, user) {
     groupPolicy.forEach((item) => {
         item.unshift('g');
     });
-    obj['p'] = concat(policy, groupPolicy);
+    obj['p'] = [...policy, ...groupPolicy];
     return JSON.stringify(obj);
 }

package/lib/esm/index.js

@@ -11,9 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-var _a;
 import * as Util from './util';
-import { setDefaultFileSystem } from './persist';
 export * from './config';
 export * from './enforcer';
 export * from './cachedEnforcer';
@@ -25,16 +23,3 @@ export * from './rbac';
 export * from './log';
 export * from './frontend';
 export { Util };
-if (typeof process !== 'undefined' && ((_a = process === null || process === void 0 ? void 0 : process.versions) === null || _a === void 0 ? void 0 : _a.node)) {
-    const requireFunc = typeof __non_webpack_require__ === 'function' ? __non_webpack_require__ : require;
-    const fs = requireFunc('fs');
-    const defaultFileSystem = {
-        readFileSync(path, encoding) {
-            return fs.readFileSync(path, { encoding });
-        },
-        writeFileSync(path, text, encoding) {
-            return fs.writeFileSync(path, text, encoding);
-        },
-    };
-    setDefaultFileSystem(defaultFileSystem);
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "casbin",
-  "version": "5.24.0",
+  "version": "5.24.2",
   "description": "An authorization library that supports access control models like ACL, RBAC, ABAC in Node.JS",
   "main": "lib/cjs/index.js",
   "typings": "lib/cjs/index.d.ts",
@@ -27,7 +27,6 @@
     "@semantic-release/npm": "^7.1.3",
     "@semantic-release/release-notes-generator": "^9.0.3",
     "@types/jest": "^26.0.20",
-    "@types/lodash": "^4.14.168",
     "@types/node": "^10.5.3",
     "@types/picomatch": "^2.2.2",
     "@typescript-eslint/eslint-plugin": "^4.17.0",