Added lab configs to node and fromFile

oats-center · Mar 30, 2024 · e5c18e7 · e5c18e7
1 parent e83a898
commit e5c18e7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/app/bigdemo.zip → app/public/bigdemo.zip b/app/bigdemo.zip → app/public/bigdemo.zip
diff --git a/app/curateddemo.zip → app/public/curateddemo.zip b/app/curateddemo.zip → app/public/curateddemo.zip
diff --git a/convert/package.json b/convert/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@modusjs/convert",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "packageManager": "[email protected]",
   "description": "Universal library for interacting with Modus XML files",
   "type": "module",

diff --git a/convert/src/browser/file.ts b/convert/src/browser/file.ts
@@ -45,12 +45,12 @@ function isBrowserInputFile(obj: any): obj is BrowserInputFile {
 }
 
 // Trying to get the universal typings to work even thought the browser/node API is different (and node doesn't have File)
-export async function fromFile(files: any | any[]) {
+export async function fromFile(files: any | any[], labConfigs?: LabConfig[]) {
   if (!Array.isArray(files)) {
     files = [files];
   }
   const browser_files = files.filter(isBrowserInputFile) as BrowserInputFile[];
-  return fromFileBrowser(browser_files);
+  return fromFileBrowser(browser_files, labConfigs);
 }
 
 export async function fromFileBrowser(
@@ -175,4 +175,4 @@ async function readFileAsArrayBuffer(f: File): Promise<ArrayBuffer> {
     };
     return reader.readAsArrayBuffer(f);
   });
-}
+}
diff --git a/convert/src/node/file.ts b/convert/src/node/file.ts
@@ -2,6 +2,7 @@ import fs from 'fs/promises';
 import debug from 'debug';
 import { csv, json } from '../index.js';
 import prompts from 'prompts';
+import { LabConfig } from '../labs/index.js';
 
 import {
   save as universalSave,
@@ -46,7 +47,7 @@ function isNodeInputFile(obj: any): obj is NodeInputFile {
   return true;
 }
 
-export async function fromFile(files: any | any[]) {
+export async function fromFile(files: any | any[], labConfigs?: LabConfig[]) {
   if (!Array.isArray(files)) {
     files = [files];
   }
@@ -56,7 +57,8 @@ export async function fromFile(files: any | any[]) {
 }
 
 export async function fromFileNode(
-  files: NodeInputFile | NodeInputFile[]
+  files: NodeInputFile | NodeInputFile[],
+  labConfigs?: LabConfig[]
 ): Promise<json.ModusJSONConversionResult[]> {
   if (!Array.isArray(files)) {
     files = [files];
@@ -100,7 +102,7 @@ export async function fromFileNode(
   );
   // Await all the promises that are reading files, and then filter any nulls (i.e. files skipped)
   const toconvert = await Promise.all(toconvert_promises);
-  return json.toJson(toconvert.filter((f) => !!f) as json.InputFile[]);
+  return json.toJson(toconvert.filter((f) => !!f) as json.InputFile[], labConfigs);
 }
 
 // We'll make a node-specific version of save here that