silgi 0.25.17 → 0.25.20

package/dist/cli/index.mjs

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

package/dist/cli/init.mjs

@@ -1,8 +1,8 @@
 import { writeFileSync } from 'node:fs';
+import fsp from 'node:fs/promises';
 import * as p from '@clack/prompts';
 import { defineCommand, runCommand } from 'citty';
 import consola from 'consola';
-import fsp from 'node:fs/promises';
 import { dirname } from 'pathe';
 import { p as prepare } from './prepare.mjs';
 import 'silgi/meta';

package/dist/cli/writeTypesAndFiles.mjs

@@ -315,63 +315,9 @@ async function nitroFramework(silgi, skip = false) {
   });
   if (silgi.options.imports !== false) {
     silgi.options.imports.presets ??= [];
-    silgi.options.imports.presets.push(...getNitroImportsPreset());
   }
   await h3Framework(silgi, true);
 }
-function getNitroImportsPreset() {
-  return [
-    {
-      from: "nitropack/runtime/internal/app",
-      imports: ["useNitroApp"]
-    },
-    {
-      from: "nitropack/runtime/internal/config",
-      imports: ["useRuntimeConfig", "useAppConfig"]
-    },
-    {
-      from: "nitropack/runtime/internal/plugin",
-      imports: ["defineNitroPlugin", "nitroPlugin"]
-    },
-    {
-      from: "nitropack/runtime/internal/cache",
-      imports: [
-        "defineCachedFunction",
-        "defineCachedEventHandler",
-        "cachedFunction",
-        "cachedEventHandler"
-      ]
-    },
-    {
-      from: "nitropack/runtime/internal/storage",
-      imports: ["useStorage"]
-    },
-    {
-      from: "nitropack/runtime/internal/renderer",
-      imports: ["defineRenderHandler"]
-    },
-    {
-      from: "nitropack/runtime/internal/meta",
-      imports: ["defineRouteMeta"]
-    },
-    {
-      from: "nitropack/runtime/internal/route-rules",
-      imports: ["getRouteRules"]
-    },
-    {
-      from: "nitropack/runtime/internal/context",
-      imports: ["useEvent"]
-    },
-    {
-      from: "nitropack/runtime/internal/task",
-      imports: ["defineTask", "runTask"]
-    },
-    {
-      from: "nitropack/runtime/internal/error/utils",
-      imports: ["defineNitroErrorHandler"]
-    }
-  ];
-}
 
 async function nuxtFramework(silgi, skip = false) {
   if (silgi.options.preset !== "nuxt" && skip === false)

package/dist/kit/index.d.mts

@@ -18,6 +18,31 @@ declare function tryResolveModule(id: string, url?: string | string[]): Promise<
 declare function writeFile(file: string, contents: Buffer | string, log?: boolean): Promise<void>;
 declare function isDirectory(path: string): Promise<boolean>;
 
+/**
+ * Interface for function call configurations
+ */
+interface FunctionConfig {
+    name: string;
+    args: any[];
+}
+declare function createFunctionConfigs(configs: FunctionConfig[]): FunctionConfig[];
+/**
+ * Generic utility function to create function call configurations
+ * @param name Function name
+ * @param args Function arguments (default empty object)
+ * @returns Structured function configuration
+ */
+declare function createFunction(name: string, args?: any): FunctionConfig;
+/**
+ * Format function calls with consistent indentation for code generation
+ * @param configs Array of function configurations
+ * @param indentation Spaces for indentation (default 4)
+ * @param specialVars Array of variable names that should be treated as code references not strings
+ * @param deduplicateArgs Whether to extract duplicate arguments into variables (default false)
+ * @returns Formatted string of function calls
+ */
+declare function formatFunctions(configs: FunctionConfig[], indentation?: number, specialVars?: string[], deduplicateArgs?: boolean): string;
+
 declare function genEnsureSafeVar(name: string | any): string;
 declare function getAllEntries(obj: object): [string, any][];
 
@@ -149,4 +174,5 @@ declare function hasInstalledModule(moduleKey: string, silgi?: SilgiCLI): boolea
 declare const baseHeaderBannerComment: string[];
 declare function processFilePath(src: string): string;
 
-export { MODE_RE, addTemplate, baseHeaderBannerComment, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, genEnsureSafeVar, getAllEntries, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, ipAddress, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };
+export { MODE_RE, addTemplate, baseHeaderBannerComment, createFunction, createFunctionConfigs, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, formatFunctions, genEnsureSafeVar, getAllEntries, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, ipAddress, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };
+export type { FunctionConfig };

package/dist/kit/index.mjs

@@ -87,6 +87,85 @@ async function isDirectory$1(path) {
   }
 }
 
+function createFunctionConfigs(configs) {
+  return configs;
+}
+function createFunction(name, args = {}) {
+  return {
+    name,
+    args: Object.keys(args).length > 0 ? [args] : []
+  };
+}
+function formatFunctions(configs, indentation = 4, specialVars = [], deduplicateArgs = false) {
+  const indent = " ".repeat(indentation);
+  const argMap = /* @__PURE__ */ new Map();
+  const argVarDeclarations = [];
+  let argCounter = 0;
+  if (deduplicateArgs) {
+    configs.forEach((config) => {
+      if (config.args.length > 0) {
+        const argStr = JSON.stringify(config.args[0]);
+        if (!argMap.has(argStr) && argStr.length > 20) {
+          const varName = `args${argCounter++}`;
+          argMap.set(argStr, varName);
+          argVarDeclarations.push(`const ${varName} = ${processArgString(argStr, specialVars, indentation)}`);
+        }
+      }
+    });
+  }
+  function processArgString(argStr, specialVars2, indentLevel) {
+    const parsed = JSON.parse(argStr);
+    const prettified = formatObjectWithIndentation(parsed, indentLevel);
+    let processed = prettified;
+    specialVars2.forEach((varName) => {
+      processed = processed.replace(new RegExp(`"${varName}"`, "g"), varName);
+    });
+    return processed;
+  }
+  function formatObjectWithIndentation(obj, indentLevel) {
+    const baseIndent = " ".repeat(indentLevel);
+    const innerIndent = " ".repeat(indentLevel + 2);
+    if (typeof obj !== "object" || obj === null) {
+      return JSON.stringify(obj);
+    }
+    if (Array.isArray(obj)) {
+      if (obj.length === 0)
+        return "[]";
+      const items = obj.map(
+        (item) => `${innerIndent}${formatObjectWithIndentation(item, indentLevel + 2)}`
+      ).join(",\n");
+      return `[
+${items}
+${baseIndent}]`;
+    }
+    if (Object.keys(obj).length === 0)
+      return "{}";
+    const entries = Object.entries(obj).map(([key, value]) => {
+      return `${innerIndent}${key}: ${formatObjectWithIndentation(value, indentLevel + 2)}`;
+    }).join(",\n");
+    return `{
+${entries}
+${baseIndent}}`;
+  }
+  const formattedCalls = configs.map((config) => {
+    if (config.args.length === 0) {
+      return `${indent}${config.name}()`;
+    }
+    const argStr = JSON.stringify(config.args[0]);
+    if (deduplicateArgs && argMap.has(argStr) && argStr.length > 20) {
+      return `${indent}${config.name}(${argMap.get(argStr)})`;
+    } else {
+      return `${indent}${config.name}(${processArgString(argStr, specialVars, indentation)})`;
+    }
+  }).join(",\n");
+  if (deduplicateArgs && argVarDeclarations.length > 0) {
+    return `${argVarDeclarations.join(";\n")};
+
+${formattedCalls}`;
+  }
+  return formattedCalls;
+}
+
 const reservedCode = /* @__PURE__ */ new Set([
   "process",
   "global",
@@ -526,4 +605,4 @@ function isValidIp(ip) {
   return false;
 }
 
-export { MODE_RE, addTemplate, baseHeaderBannerComment, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, genEnsureSafeVar, getAllEntries, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, ipAddress, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };
+export { MODE_RE, addTemplate, baseHeaderBannerComment, createFunction, createFunctionConfigs, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, formatFunctions, genEnsureSafeVar, getAllEntries, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, ipAddress, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "silgi",
   "type": "module",
-  "version": "0.25.17",
+  "version": "0.25.20",
   "private": false,
   "sideEffects": false,
   "exports": {
@@ -67,17 +67,17 @@
     }
   },
   "dependencies": {
-    "@clack/prompts": "^0.10.0",
-    "@fastify/deepmerge": "^3.0.0",
+    "@clack/prompts": "^0.10.1",
+    "@fastify/deepmerge": "^3.1.0",
     "@oxc-parser/wasm": "^0.60.0",
     "@standard-schema/spec": "^1.0.0",
-    "c12": "^3.0.2",
+    "c12": "^3.0.3",
     "chokidar": "^4.0.3",
     "citty": "^0.1.6",
-    "compatx": "^0.1.8",
+    "compatx": "^0.2.0",
     "consola": "^3.4.2",
     "defu": "^6.1.4",
-    "destr": "^2.0.3",
+    "destr": "^2.0.5",
     "dev-jiti": "^2.4.2",
     "dot-prop": "^9.0.0",
     "dotenv": "^16.4.7",
@@ -96,28 +96,28 @@
     "pkg-types": "^2.1.0",
     "scule": "^1.3.0",
     "semver": "^7.7.1",
-    "std-env": "^3.8.1",
-    "ufo": "^1.5.4",
+    "std-env": "^3.9.0",
+    "ufo": "^1.6.1",
     "unctx": "^2.4.1",
-    "unimport": "^4.1.2",
+    "unimport": "^5.0.0",
     "unstorage": "^1.15.0",
     "untyped": "^2.0.0"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^4.11.0",
-    "@nuxt/kit": "^3.16.1",
-    "@nuxt/schema": "^3.16.1",
+    "@nuxt/kit": "^3.16.2",
+    "@nuxt/schema": "^3.16.2",
     "@silgi/ecosystem": "^0.4.4",
-    "@types/node": "^22.13.13",
-    "@types/semver": "^7.5.8",
+    "@types/node": "^22.14.0",
+    "@types/semver": "^7.7.0",
     "@vitest/coverage-v8": "3.0.5",
-    "eslint": "^9.23.0",
+    "eslint": "^9.24.0",
     "h3": "^1.15.1",
-    "nitropack": "^2.11.7",
-    "nuxt": "^3.16.1",
-    "typescript": "^5.8.2",
+    "nitropack": "^2.11.8",
+    "nuxt": "^3.16.2",
+    "typescript": "^5.8.3",
     "unbuild": "^3.5.0",
-    "vitest": "^3.0.9",
+    "vitest": "^3.1.1",
     "vue": "^3.5.13",
     "zod": "^3.24.2"
   },