tungsten 0.2.11 → 0.2.12

package/dist/Framework.js

@@ -20,7 +20,7 @@ import { staticGen } from "./staticGen/staticGen.js";
 import { throwError } from "./throwError.js";
 //import { devBundle } from './build/devBundle.jsx'
 import { existsSync, readFileSync, openSync, closeSync, writeFileSync, copyFileSync } from 'fs';
-import { parseIni } from "./parseIni.js";
+import dotenv from 'dotenv';
 import { getEnvSchemas } from "./env/getEnvSchemas.js";
 import { injectEnv } from "./env/injectEnv.js";
 //import { ValueOf } from 'sxy-lib'
@@ -167,7 +167,7 @@ export class Framework {
     let someEnvLoaded = false; // eslint-disable-line no-type-assertion/no-type-assertion -- widening
     //const envsLoadedMessages: string[] = []
     function loadEnv(fileName, filePath, prefix = '') {
-      const env = parseIni(readFileSync(filePath, 'utf-8'));
+      const env = dotenv.parse(readFileSync(filePath, 'utf-8'));
       someEnvLoaded = true;
       cliOut(`${fileName} loaded from ${filePath}`);
       injectEnv(env, process.env, prefix);

package/dist/Servers/loadEnvsDev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadEnvsDev.d.ts","sourceRoot":"","sources":["../../src/Servers/loadEnvsDev.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAQpE,KAAK,UAAU,GAAG;IACd,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAChC,EAAE,CAAC,EAAE,MAAM,CAAC;CACf,CAAA;AAED,wBAAsB,WAAW,CAC7B,MAAM,EAAE,uBAAuB,EAE/B,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,UAAU,EAC7B,UAAU,EAAE,OAAO,EACnB,eAAe,UAAQ,iBAuH1B"}
+{"version":3,"file":"loadEnvsDev.d.ts","sourceRoot":"","sources":["../../src/Servers/loadEnvsDev.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAQpE,KAAK,UAAU,GAAG;IACd,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAChC,EAAE,CAAC,EAAE,MAAM,CAAC;CACf,CAAA;AAED,wBAAsB,WAAW,CAC7B,MAAM,EAAE,uBAAuB,EAE/B,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,UAAU,EAC7B,UAAU,EAAE,OAAO,EACnB,eAAe,UAAQ,iBAsH1B"}

package/dist/Servers/loadEnvsDev.js

@@ -2,7 +2,7 @@ import { join } from 'path';
 import { readFile as readFilePromise, access as accessPromise } from 'fs/promises';
 import { remap as objectRemap, filter as objectFilter } from 'sxy-lib/objects.js';
 import { getEnvSchemasDev } from "../env/getEnvSchemas.js";
-import { parseIni } from "../parseIni.js";
+import dotenv from 'dotenv';
 import { cliLog, cliOut } from "../cliOutput.js";
 import { injectEnv } from "../env/injectEnv.js";
 import { throwError } from 'tungsten/throwError.js';
@@ -38,7 +38,7 @@ iteration, initialProcessEnv, _firstLoad, useTestEnvFiles = false) {
   const tryLoadEnvFile = async (fileName, filePath, prefix = '') => {
     try {
       //cliOut(`try to load env from ${filePath}`)
-      const env = parseIni(await readFilePromise(filePath, 'utf-8'));
+      const env = dotenv.parse(await readFilePromise(filePath, 'utf-8'));
       someEnvLoaded = true;
       if (_firstLoad) cliOut(`${fileName} loaded from ${filePath}`);
       //cliOut(fileName, JSON.stringify(env, null, 4))
@@ -53,7 +53,10 @@ iteration, initialProcessEnv, _firstLoad, useTestEnvFiles = false) {
     }
   };
   const [envPath, privateEnvPath, publicEnvPath] = await Promise.all([resolveEnvFile(envLocation, testEnvLocation), resolveEnvFile(privateEnvLocation, testPrivateEnvLocation), resolveEnvFile(publicEnvLocation, testPublicEnvLocation)]);
-  await Promise.all([tryLoadEnvFile('.env', envPath), tryLoadEnvFile('.env.private', privateEnvPath), tryLoadEnvFile('.env.public', publicEnvPath, 'TUNGSTEN_PUBLIC_')]);
+  // sequential, so later files override earlier ones consistently with prod (Framework.ts)
+  await tryLoadEnvFile('.env', envPath);
+  await tryLoadEnvFile('.env.private', privateEnvPath);
+  await tryLoadEnvFile('.env.public', publicEnvPath, 'TUNGSTEN_PUBLIC_');
   if (_firstLoad && !someEnvLoaded) cliOut('No env files were loaded');
   //console.log('check for schemas')
   // If there are env schemas, load the relevant env and parse with schemas
@@ -62,14 +65,18 @@ iteration, initialProcessEnv, _firstLoad, useTestEnvFiles = false) {
     // global.tungstenPrivateEnv = envSchemas.privateEnvSchema.parse(process.env)
     const result = envSchemas.privateEnvSchema.safeParse(tempEnv);
     if (!result.success) {
-      throwError('Your environment variables failed your privateEnvSchema validation', '\n' + JSON.stringify(result.error.format(), null, 4) + '\nenv: ' + JSON.stringify(tempEnv, null, 4) + '\nparsed env ' + JSON.stringify(tempEnv, null, 4));
+      throwError('Your environment variables failed your privateEnvSchema validation', '\n' + JSON.stringify(result.error.format(), null, 4) + '\nenv: ' + JSON.stringify(tempEnv, null, 4)
+      //+ '\nparsed env ' + JSON.stringify(tempEnv, null, 4)  
+      );
     }
     const coreResult = tungstenCorePrivateEnvSchema.safeParse(result.data);
     //console.log('coreResult', coreResult)
     if (!coreResult.success) {
       throwError('Your private environment variables don\'t meet the Tungsten requirements. Ensure your .env and privateEnvSchema provide an output meeting these requirements. You may need to coerce data to the correct type.',
       // eslint-disable-line max-len
-      '\n' + JSON.stringify(coreResult.error.format(), null, 4) + '\nenv: ' + JSON.stringify(tempEnv, null, 4) + '\nparsed env ' + JSON.stringify(tempEnv, null, 4));
+      '\n' + JSON.stringify(coreResult.error.format(), null, 4) + '\nenv: ' + JSON.stringify(tempEnv, null, 4)
+      //+ '\nparsed env ' + JSON.stringify(tempEnv, null, 4)  
+      );
     }
     global.tungstenPrivateEnv = result.data;
     //console.log('global.tungstenPrivateEnv', global.tungstenPrivateEnv)

package/dist/Servers/portError.js

@@ -1,3 +1,3 @@
 export function portError(port) {
-  return `Invalid port: '${port}'. Did you specify 'TUNGSTEN_SERVER_PORT' in .env, .private.env or .public.env?`;
+  return `Invalid port: '${port}'. Did you specify 'TUNGSTEN_SERVER_PORT' in .env, .env.private or .env.public?`;
 }

package/dist/bin/commands/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/dev.ts"],"names":[],"mappings":"AAuCA,OAAO,EAAE,CAAA"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/dev.ts"],"names":[],"mappings":"AAwCA,OAAO,EAAE,CAAA"}

package/dist/bin/commands/dev.js

@@ -1,10 +1,8 @@
 import open from 'open';
 import { cliOut } from "../../cliOutput.js";
 import { Framework } from "../../Framework.js";
-import dotenv from 'dotenv';
-dotenv.config({
-  path: '.private.env'
-});
+//import dotenv from 'dotenv'
+//dotenv.config({ path: '.private.env' })
 cliOut(`Starting dev mode`);
 //// prep the app
 const sxyFramework = new Framework();

package/dist/bin/commands/start.js

@@ -1,8 +1,6 @@
 import { Framework } from "../../Framework.js";
-import dotenv from 'dotenv';
-dotenv.config({
-  path: '.private.env'
-});
+//import dotenv from 'dotenv'
+//dotenv.config({ path: '.private.env' })
 console.log('tungsten start');
 //// prep the framework
 const framework = new Framework();

package/dist/env/privateEnv.js

@@ -4,7 +4,7 @@ export function privateEnv(key) {
   if (isClient) throw new Error('Error, tried to access privateEnv from client');
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
   if (tungstenPrivateEnv === undefined) {
-    throwError('publicEnv', 'Tungsten Private Env is undefined - do you have a .env or .private.env file?');
+    throwError('publicEnv', 'Tungsten Private Env is undefined - do you have a .env or .env.private file?');
   }
   return tungstenPrivateEnv[key];
 }

package/dist/env/privateEnvOrThrow.js

@@ -1,6 +1,6 @@
 import { privateEnv } from "./privateEnv.js";
 export function privateEnvOrThrow(key) {
   const v = privateEnv(key);
-  if (v === undefined) throw new Error(`${String(key)} is missing from .public.env`);
+  if (v === undefined) throw new Error(`${String(key)} is missing from .env.private`);
   return v;
 }

package/dist/env/publicEnv.js

@@ -1,5 +1,5 @@
 import { throwError } from "../throwError.js";
 export function publicEnv(key) {
-  if (tungstenPublicEnv === undefined) throwError('publicEnv', 'Tungsten Public Env is undefined - do you have a .public.env file?');
+  if (tungstenPublicEnv === undefined) throwError('publicEnv', 'Tungsten Public Env is undefined - do you have a .env.public file?');
   return tungstenPublicEnv[key];
 }

package/dist/env/publicEnvOrThrow.js

@@ -1,6 +1,6 @@
 import { publicEnv } from "./publicEnv.js";
 export function publicEnvOrThrow(key) {
   const v = publicEnv(key);
-  if (v === undefined) throw new Error(`${String(key)} is missing from .public.env`);
+  if (v === undefined) throw new Error(`${String(key)} is missing from .env.public`);
   return v;
 }

package/dist/possibleEnvFiles.d.ts

@@ -1,2 +1,2 @@
-export declare const possibleEnvFiles: string[];
+export {};
 //# sourceMappingURL=possibleEnvFiles.d.ts.map

package/dist/possibleEnvFiles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"possibleEnvFiles.d.ts","sourceRoot":"","sources":["../src/possibleEnvFiles.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,gBAAgB,UAAmD,CAAA"}
+{"version":3,"file":"possibleEnvFiles.d.ts","sourceRoot":"","sources":["../src/possibleEnvFiles.ts"],"names":[],"mappings":""}

package/dist/possibleEnvFiles.js

@@ -1 +1,2 @@
-export const possibleEnvFiles = ['.env.js', '.private.env.js', '.public.env.js'];
+export {};
+//export const possibleEnvFiles = ['.env.js', '.private.env.js', '.public.env.js']

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tungsten",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "description": "",
   "type": "module",
   "bin": {

package/dist/parseIni.d.ts

@@ -1,4 +0,0 @@
-export declare function parseIni(content: string): Record<string, string>;
-export declare function parseIniFile(file: string): Promise<Record<string, string>>;
-export declare function parseIniFileSync(file: string): Record<string, string>;
-//# sourceMappingURL=parseIni.d.ts.map

package/dist/parseIni.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"parseIni.d.ts","sourceRoot":"","sources":["../src/parseIni.ts"],"names":[],"mappings":"AAIA,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAEhE;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAEhF;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAErE"}

package/dist/parseIni.js

@@ -1,11 +0,0 @@
-import { promises as fsPromises, readFileSync } from 'fs';
-import ini from 'ini';
-export function parseIni(content) {
-  return ini.parse(content);
-}
-export async function parseIniFile(file) {
-  return parseIni(await fsPromises.readFile(file, 'utf-8'));
-}
-export function parseIniFileSync(file) {
-  return parseIni(readFileSync(file, 'utf-8'));
-}