feat: wip

package.json

@@ -31,6 +31,7 @@
     "@dfinity/principal": "^0.20.2",
     "@junobuild/admin": "^0.0.45",
     "@junobuild/core-peer": "^0.0.10",
+    "@junobuild/types": "file:../juno-js/packages/types",
     "@junobuild/utils": "^0.0.18",
     "conf": "^12.0.0",
     "file-type": "^19.0.0",

src/configs/juno.config.ts

@@ -1,4 +1,4 @@
-import {existsSync} from 'node:fs';
+import {existsSync, readFileSync} from 'node:fs';
 import {access, readFile, writeFile} from 'node:fs/promises';
 import {join} from 'node:path';
 import {JUNO_CONFIG_FILENAME} from '../constants/constants';
@@ -77,23 +77,54 @@ const junoConfigFile = (): {configPath: string; configType: 'ts' | 'js' | 'json'
     };
   }
 
+  const junoCjs = join(process.cwd(), `${JUNO_CONFIG_FILENAME}.cjs`);
+
+  if (existsSync(junoCjs)) {
+    return {
+      configPath: junoCjs,
+      configType: 'js'
+    };
+  }
+
   return {
     configPath: join(process.cwd(), `${JUNO_CONFIG_FILENAME}.json`),
     configType: 'json'
   };
 };
 
+// TODO
 const writeJunoConfig = async (config: JunoConfig): Promise<void> => {
   await writeFile(JUNO_CONFIG_FILENAME, JSON.stringify(config, null, 2), 'utf-8');
 };
 
+// TODO: replace
+export function defineConfig(config: JunoConfig): JunoConfig;
+export function defineConfig(config: JunoConfig): JunoConfig {
+  return config;
+}
+
 const readJunoConfig = async (): Promise<JunoConfig> => {
   const {configPath, configType} = junoConfigFile();
 
   switch (configType) {
     case 'ts': {
-      const modTs = nodeRequire<JunoConfig>(configPath);
-      return modTs.default;
+
+      // const module = await import(`data:text/javascript;base64,${Buffer.from(readFileSync(configPath).toString()).toString(`base64`)}`);
+      // console.log('MODUE', module)
+      //
+      // console.log(readFileSync(configPath).toString());
+      // const tmp = `data:text/javascript,${readFileSync(configPath).toString()}`;
+      // const result = await import(tmp);
+      //
+      //
+      // console.log('instance', result);
+
+      const userConfig = nodeRequire<JunoConfig | typeof defineConfig>(configPath).default;
+      const config = typeof userConfig === 'function' ? userConfig : userConfig;
+
+      console.log('Config', config);
+
+      return config;
     }
     case 'js': {
       const modJs = await import(configPath);

src/utils/node.utils.ts

@@ -1,6 +1,7 @@
 import {transformFileSync} from '@babel/core';
 import * as mod from '@babel/plugin-transform-modules-commonjs';
 import * as ts from '@babel/preset-typescript';
+import * as tst from "@junobuild/types";
 import {readFileSync} from 'node:fs';
 
 /**
@@ -25,6 +26,9 @@ export const nodeRequire = <T>(id: string): {default: T} => {
           presets: [ts.default],
           plugins: [mod.default]
         }).code;
+
+        console.log(sourceText)
+
       } else {
         // quick hack to turn a modern es module
         // into and old school commonjs module