fix: using import() to load the fs (#435)

Signed-off-by: Zixuan Liu <nodeces@gmail.com>
casbin · Feb 24, 2023 · e90a8bf · e90a8bf
1 parent 5d5a7f1
commit e90a8bf
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 23 deletions.
diff --git a/src/enforcer.ts b/src/enforcer.ts
@@ -14,7 +14,7 @@
 
 import { ManagementEnforcer } from './managementEnforcer';
 import { Model, newModelFromFile } from './model';
-import { Adapter, FileAdapter, StringAdapter } from './persist';
+import { Adapter, FileAdapter, getDefaultFileSystem, setDefaultFileSystem, StringAdapter } from './persist';
 import { getLogger } from './log';
 import { arrayRemoveDuplicates } from './util';
 import { FieldIndex } from './constants';
@@ -467,6 +467,24 @@ export class Enforcer extends ManagementEnforcer {
 }
 
 export async function newEnforcerWithClass<T extends Enforcer>(enforcer: new () => T, ...params: any[]): Promise<T> {
+  // inject the FS
+  if (!getDefaultFileSystem()) {
+    try {
+      if (typeof process !== 'undefined' && process?.versions?.node) {
+        const fs = await import('fs');
+        const defaultFileSystem = {
+          readFileSync(path: string, encoding?: string) {
+            return fs.readFileSync(path, { encoding });
+          },
+          writeFileSync(path: string, text: string, encoding?: string) {
+            return fs.writeFileSync(path, text, encoding);
+          },
+        };
+        setDefaultFileSystem(defaultFileSystem);
+      }
+    } catch (ignored) {}
+  }
+
   const e = new enforcer();
 
   let parsedParamLen = 0;

diff --git a/src/index.ts b/src/index.ts
@@ -26,17 +26,3 @@ export * from './rbac';
 export * from './log';
 export * from './frontend';
 export { Util };
-
-if (typeof process !== 'undefined' && process?.versions?.node) {
-  const requireFunc = typeof __non_webpack_require__ === 'function' ? __non_webpack_require__ : require;
-  const fs = requireFunc('fs');
-  const defaultFileSystem = {
-    readFileSync(path: string, encoding?: string) {
-      return fs.readFileSync(path, { encoding });
-    },
-    writeFileSync(path: string, text: string, encoding?: string) {
-      return fs.writeFileSync(path, text, encoding);
-    },
-  };
-  setDefaultFileSystem(defaultFileSystem);
-}
diff --git a/test/config/config.test.ts b/test/config/config.test.ts
@@ -1,6 +1,7 @@
 import { Config } from '../../src';
+import { readFileSync } from 'fs';
 
-const config = Config.newConfig('test/config/testini.ini');
+const config = Config.newConfigFromText(readFileSync('test/config/testini.ini').toString());
 
 describe('multi-line test', () => {
   it('should config.get("multi1::name") to equal r.sub==p.sub&&r.obj==p.obj', function () {

diff --git a/test/model/model.test.ts b/test/model/model.test.ts
@@ -43,12 +43,6 @@ test('TestNewModel', () => {
   expect(m !== null).toBe(true);
 });
 
-test('TestNewModelFromFile', () => {
-  const m = newModelFromFile(basicExample);
-
-  expect(m !== null).toBe(true);
-});
-
 test('TestNewModelFromString', () => {
   const m = newModelFromString(readFileSync(basicExample).toString());
 

diff --git a/test/persist/fileSystem.test.ts b/test/persist/fileSystem.test.ts
@@ -16,7 +16,7 @@ import { FileSystem, getDefaultFileSystem, setDefaultFileSystem } from '../../sr
 
 test('get an set the default system', async () => {
   let fs = getDefaultFileSystem();
-  expect(fs).toBeDefined();
+  expect(fs).toBeUndefined();
   const defaultFileSystem: FileSystem = {
     readFileSync(path: string, encoding?: string): Buffer {
       // noop