@environment-safe/file 0.3.0 → 0.3.2

package/.husky/pre-commit

@@ -4,6 +4,7 @@
 npm run lint
 npm run path-test
 npm run headless-browser-path-test
+npm run link-local-moka
 npm run import-test
 npm run headless-browser-test
 #npm run build-commonjs

package/README.md

@@ -111,3 +111,5 @@ All work is done in the .mjs files and will be transpiled on commit to commonjs
 
 If the above tests pass, then attempt a commit which will generate .d.ts files alongside the `src` files and commonjs classes in `dist`
 
+In order to run the `import-test`, you must link the local `moka`, which can be done with `npm run link-local-moka` This is normally solved via dependency hoisting except in the case where you are developing on the file API which has a circular dependency with `moka`.
+

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@environment-safe/file",
-    "version": "0.3.0",
+    "version": "0.3.2",
     "type": "module",
     "main": "dist/index.mjs",
     "module": "src/index.mjs",
@@ -77,7 +77,7 @@
         "@environment-safe/chai": "^0.1.0",
         "@environment-safe/commonjs-builder": "^0.0.3",
         "@environment-safe/jsdoc-builder": "^0.0.2",
-        "@open-automaton/moka": "^0.5.0",
+        "@open-automaton/moka": "^0.5.1",
         "babel-plugin-search-and-replace": "^1.1.1",
         "babel-plugin-transform-import-meta": "^2.2.0",
         "chai": "^4.3.7",
@@ -110,6 +110,7 @@
         "container-test": "docker build . -t environment-safe-package.json -f ./containers/test.dockerfile; docker logs --follow \"$(docker run -d environment-safe-package.json)\"",
         "build-docs": "build-jsdoc docs",
         "build-types": "build-jsdoc types",
+        "link-local-moka":"npm link ../../@open-automaton/moka; cd ../../@open-automaton/moka; npm link ../../@environment-safe/file",
         "add-generated-files-to-commit": "git add docs/*.md; git add src/*.d.ts; git add dist/*.cjs",
         "prepare": "husky install"
     },

package/src/buffer.mjs

@@ -142,7 +142,17 @@ if(isBrowser || isJsDom){
             case 'string':
                 return buffer.toString();
             case 'base64':
-                return buffer.toString('base64');
+                if(buffer.constructor.name === 'ArrayBuffer'){
+                    return btoa([].reduce.call(
+                        new Uint8Array(buffer),
+                        function(p,c){
+                            return p+String.fromCharCode(c);
+                        },
+                        ''
+                    ));
+                }else{
+                    return buffer.toString('base64');
+                }
             case '':
             
         }

package/src/filesystem.mjs

@@ -343,7 +343,8 @@ export const serverFile = {
                 const parsed = new Path(path);
                 const url = parsed.toUrl('native');
                 return await new Promise((resolve, reject)=>{
-                    fs.writeFile(url, buffer, (err)=>{
+                    const outBuffer = (buffer.constructor.name === 'ArrayBuffer')?FileBuffer.from(buffer):buffer;
+                    fs.writeFile(url, outBuffer, (err)=>{
                         if(err) return reject(err);
                         if(globalThis.handleWrite){
                             globalThis.handleWrite({
@@ -354,7 +355,7 @@ export const serverFile = {
                                     return FileBuffer.toString('string', buffer);
                                 },
                                 arrayBuffer: ()=> buffer,
-                            }); 
+                            });
                         }
                         resolve();
                     });

package/src/index.mjs

@@ -27,8 +27,14 @@ let remote=null;
 
 export const initialized = async (path, options={})=>{
     if(isServer){
-        if(serverFile) return;
-        serverFile = await sf.initialize();
+        if(path.indexOf('://') !== -1){
+            if(remote) return;
+            //remote url
+            remote = await r.initialize();
+        }else{
+            if(serverFile) return;
+            serverFile = await sf.initialize();
+        }
     }else{
         if(isLocalFileRoot){
             if(file) return;
@@ -70,7 +76,11 @@ export const act = async (action, ...args)=>{
     const options = args[1] || {};
     await initialized(path, options);
     if(isServer){
-        return serverFile[action].apply(serverFile, args);
+        if(path.indexOf('://') !== -1){
+            return remote[action].apply(remote, args);
+        }else{
+            return serverFile[action].apply(serverFile, args);
+        }
     }else{
         if(isLocalFileRoot){
             return file[action].apply(file, args);