silgi 0.25.5 → 0.25.7

package/dist/build.mjs

@@ -28,6 +28,7 @@ import '@oxc-parser/wasm';
 import 'klona';
 import 'silgi/runtime';
 import 'unstorage';
+import 'scule';
 import './cli/types.mjs';
 import 'c12';
 import 'compatx';

package/dist/cli/dev.mjs

@@ -34,6 +34,7 @@ import '@oxc-parser/wasm';
 import 'klona';
 import 'silgi/runtime';
 import 'unstorage';
+import 'scule';
 import './types.mjs';
 import 'c12';
 import 'compatx';

package/dist/cli/index.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { defineCommand, runMain } from 'citty';
 
-const version = "0.25.5";
+const version = "0.25.7";
 const packageJson = {
 	version: version};
 

package/dist/cli/install.mjs

@@ -32,6 +32,7 @@ import '@oxc-parser/wasm';
 import 'klona';
 import 'silgi/runtime';
 import 'unstorage';
+import 'scule';
 import 'pathe/utils';
 import 'picocolors';
 import '../_chunks/silgiApp.mjs';

package/dist/cli/types.mjs

@@ -55,6 +55,14 @@ const SilgiCLIDefaults = {
     vfsDir: "{{ silgi.serverDir }}/vfs",
     typesDir: "{{ silgi.serverDir }}/types"
   },
+  // Codegen
+  codegen: {
+    env: {
+      safeList: [
+        ["silgi", "version"]
+      ]
+    }
+  },
   // Modules
   _modules: [],
   modules: [],

package/dist/cli/writeTypesAndFiles.mjs

@@ -26,6 +26,7 @@ import { klona } from 'klona';
 import { useSilgiRuntimeConfig, initRuntimeConfig } from 'silgi/runtime';
 import { createStorage, builtinDrivers } from 'unstorage';
 import { peerDependencies } from 'silgi/meta';
+import { snakeCase } from 'scule';
 import { l as loadOptions, s as silgiGenerateType } from './types.mjs';
 import { resolveAlias as resolveAlias$1 } from 'pathe/utils';
 
@@ -1584,17 +1585,6 @@ function useCLIRuntimeConfig(silgi) {
     data.runtimeConfig = safeRuntimeConfig;
     silgi.options.envOptions = silgi.options.envOptions;
   });
-  function flattenObject(obj, prefix = "SILGI") {
-    return Object.entries(obj).reduce((acc, [key, value]) => {
-      const newKey = `${prefix}_${key.toUpperCase()}`;
-      if (typeof value === "object" && value !== null) {
-        Object.assign(acc, flattenObject(value, newKey));
-      } else {
-        acc[newKey] = value;
-      }
-      return acc;
-    }, {});
-  }
   addTemplate({
     filename: "env.example",
     write: true,
@@ -1603,14 +1593,21 @@ function useCLIRuntimeConfig(silgi) {
       console.log("Generating env.example");
       const flattenedConfig = flattenObject(safeRuntimeConfig);
       const groupedVars = {};
-      Object.entries(flattenedConfig).forEach(([key, value]) => {
-        const parts = key.split("_");
-        if (parts.length >= 2) {
-          const mainCategory = parts[1];
-          if (!groupedVars[mainCategory]) {
-            groupedVars[mainCategory] = {};
+      Object.entries(flattenedConfig).forEach(([key, { value, originalPath }]) => {
+        const shouldExclude = silgi.options.codegen.env.safeList.some((safePath) => {
+          if (safePath.length !== originalPath.length)
+            return false;
+          return safePath.every((segment, index) => segment.toLowerCase() === originalPath[index].toLowerCase());
+        });
+        if (shouldExclude)
+          return;
+        if (originalPath.length > 0) {
+          const firstKey = originalPath[0];
+          const categoryName = extractCategoryFromCamel(firstKey);
+          if (!groupedVars[categoryName]) {
+            groupedVars[categoryName] = {};
           }
-          groupedVars[mainCategory][key] = value;
+          groupedVars[categoryName][key] = value;
         } else {
           if (!groupedVars.OTHER) {
             groupedVars.OTHER = {};
@@ -1629,6 +1626,28 @@ ${varsContent}`;
   silgi.options.runtimeConfig = safeRuntimeConfig;
   return _sharedRuntimeConfig;
 }
+function extractCategoryFromCamel(str) {
+  if (/^[a-z]+[A-Z]/.test(str)) {
+    const matches = str.match(/^([a-z]+)([A-Z][a-z0-9]*)?/);
+    if (matches && matches[2]) {
+      return `${matches[1].toUpperCase()}_${matches[2].toUpperCase()}`;
+    }
+  }
+  return str.toUpperCase();
+}
+function flattenObject(obj, prefix = "SILGI", originalPath = []) {
+  return Object.entries(obj).reduce((acc, [key, value]) => {
+    const formattedKey = snakeCase(key).toUpperCase();
+    const newKey = `${prefix}_${formattedKey}`;
+    const newPath = [...originalPath, key];
+    if (typeof value === "object" && value !== null) {
+      Object.assign(acc, flattenObject(value, newKey, newPath));
+    } else {
+      acc[newKey] = { value, originalPath: newPath };
+    }
+    return acc;
+  }, {});
+}
 
 const GLOB_SCAN_PATTERN = "**/*.{js,mjs,cjs,ts,mts,cts,tsx,jsx}";
 async function scanAndSyncOptions(silgi) {

package/dist/types/index.d.mts

@@ -602,6 +602,11 @@ interface SilgiCLIOptions extends PresetOptions {
     logLevel: LogLevel;
     appConfig: AppConfig;
     appConfigFiles: string[];
+    codegen: {
+        env: {
+            safeList: string[][];
+        };
+    };
     storage: StorageMounts$1;
     devStorage: StorageMounts$1;
     workspaceDir: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "silgi",
   "type": "module",
-  "version": "0.25.5",
+  "version": "0.25.7",
   "private": false,
   "sideEffects": false,
   "exports": {