silgi 0.28.11 → 0.29.0

package/dist/cli/index.mjs

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

package/dist/cli/prepare.mjs

@@ -3,12 +3,14 @@ import { resolve } from 'pathe';
 import { version } from 'silgi/meta';
 import { p as prepareEnv, c as createSilgiCLI, b as build } from './silgi.mjs';
 import { execSync } from 'node:child_process';
-import { readFileSync } from 'node:fs';
 import * as p from '@clack/prompts';
+import { isCancel, cancel } from '@clack/prompts';
 import { consola } from 'consola';
 import { createJiti } from 'dev-jiti';
-import { useSilgiCLI } from 'silgi';
-import { a as silgiCLIIClose } from '../_chunks/silgiApp.mjs';
+import { useSilgiCLI as useSilgiCLI$1 } from 'silgi';
+import { u as useSilgiCLI, a as silgiCLIIClose } from '../_chunks/silgiApp.mjs';
+import { addTemplate } from 'silgi/kit';
+import { generateTypes, resolveSchema } from 'untyped';
 import { l as loadOptions } from './types.mjs';
 
 const commonArgs = {
@@ -23,6 +25,72 @@ const commonArgs = {
   }
 };
 
+function debugMode(name) {
+  const silgi = useSilgiCLI();
+  if (silgi.options.debug === true || typeof silgi.options.debug === "object" && silgi.options.debug[name]) {
+    return true;
+  }
+  return false;
+}
+
+async function scanCommands(silgi = useSilgiCLI()) {
+  const commands = [];
+  await silgi.callHook("prepare:commands", commands);
+  if (debugMode("command")) {
+    addTemplate({
+      filename: "cli.json",
+      where: ".silgi",
+      write: true,
+      getContents: () => JSON.stringify(commands, null, 2)
+    });
+  }
+  silgi.hook("prepare:schema.ts", async (object) => {
+    const allTags = commands.reduce((acc, commandGroup) => {
+      Object.values(commandGroup).forEach((command) => {
+        if (command.tags) {
+          command.tags.forEach((tag) => acc.add(tag));
+        }
+      });
+      return acc;
+    }, /* @__PURE__ */ new Set());
+    const data = [
+      "",
+      generateTypes(
+        await resolveSchema(
+          {
+            ...Object.fromEntries(Array.from(allTags.values()).map((tag) => [tag, "string"]))
+          }
+        ),
+        {
+          interfaceName: "SilgiCommandsExtended",
+          addExport: false,
+          addDefaults: false,
+          allowExtraKeys: false,
+          indentation: 0
+        }
+      ),
+      ""
+    ];
+    object.customImports?.push(...data);
+  });
+  return commands;
+}
+
+function cancelOnCancel({
+  value,
+  message = "Cancelled",
+  onBeforeExit,
+  exitCode = 0
+} = {}) {
+  const handleCancel = () => {
+    cancel(message);
+    onBeforeExit?.();
+    process.exit(exitCode);
+  };
+  if (!value || isCancel(value))
+    handleCancel();
+}
+
 const command$1 = defineCommand({
   meta: {
     name: "run",
@@ -48,191 +116,53 @@ const command$1 = defineCommand({
     const data = args.active ? await runCommand(command, {
       rawArgs: ["--commands", "run"]
     }) : void 0;
-    globalThis.__nitro__ = globalThis.__nitro__ || {};
-    globalThis.__nitro__.useRuntimeConfig = function() {
-      return data?.result?.silgi?.options?.runtimeConfig || {};
-    };
+    const silgi = useSilgiCLI$1();
+    const commands = await scanCommands();
     if (!data?.result?.silgi && args.active) {
       consola.error("Silgi not found");
       return;
     }
-    const silgi = useSilgiCLI();
     const tags = args.tag?.split(",").map((t) => t.trim());
     const silgiConfig = await loadOptions({});
-    const getCli = resolve(silgiConfig.build.dir, "cli.json");
-    const cli = readFileSync(getCli, "utf-8");
-    const cliJson = JSON.parse(cli);
     await prepareEnv(silgiConfig);
     let selectedCommands = [];
-    if (tags) {
-      for (const commandName of Object.keys(cliJson)) {
-        const scripts = cliJson[commandName];
-        for (const scriptName of Object.keys(scripts)) {
-          const script = scripts[scriptName];
-          if (script.tags && script.tags.some((tag) => tags.includes(tag))) {
-            selectedCommands.push({
-              command: commandName,
-              script: scriptName,
-              handler: script
-            });
-          }
-        }
-      }
-      if (selectedCommands.length === 0) {
-        return;
-      }
+    if (tags?.length) {
+      selectedCommands = commands.filter((cmd) => cmd.tags?.some((tag) => tags.includes(tag))).filter((cmd) => cmd.when !== false);
     } else {
-      if (!silgi) {
-        consola.error("Silgi not found");
-        return;
-      }
-      if (Object.keys(cliJson).length === 0) {
-        consola.warn("No commands found in cli.json");
-        return;
-      }
-      const allTags = Object.values(silgi.commands).reduce((acc, commandGroup) => {
-        Object.values(commandGroup).forEach((command2) => {
-          if (command2.tags) {
-            command2.tags.forEach((tag) => acc.add(tag));
-          }
-        });
-        return acc;
-      }, /* @__PURE__ */ new Set());
-      const commandName = await p.select({
-        message: "Select a command to run",
-        options: [
-          ...allTags.size ? [{
-            value: "command-tags",
-            label: "Command Tags",
-            hint: "It executes all commands that are related to the tags you select."
-          }] : [],
-          {
-            value: "functions",
-            label: "Functions",
-            hint: "Select and run individual functions"
-          },
-          ...Object.keys(cliJson).filter((key) => {
-            const scripts = cliJson[key];
-            const scriptValues = Object.values(scripts);
-            return scriptValues;
-          }).map((key) => ({
-            label: key,
-            value: key
-          }))
-        ]
-      });
-      if (!commandName)
-        return;
-      if (commandName === "command-tags") {
-        const tags2 = Array.from(allTags);
-        const selectedTags = await p.select({
-          message: "Select tags to run",
-          options: tags2.map((tag) => ({
-            label: tag,
-            value: tag
-          }))
-        });
-        if (!selectedTags)
-          return;
-        selectedCommands = Object.keys(cliJson).map(
-          (commandName2) => {
-            const scripts = cliJson[commandName2];
-            return Object.keys(scripts).map((scriptName) => ({
-              command: commandName2,
-              script: scriptName,
-              handler: scripts[scriptName]
-            })).filter((script) => script.handler.tags?.includes(selectedTags));
-          }
-        ).flat();
-      } else if (commandName === "functions") {
-        const functionGroups = Object.keys(cliJson).reduce((groups, cmdName) => {
-          const scripts2 = cliJson[cmdName];
-          if (!Object.values(scripts2).some((script) => script.type === "function")) {
-            return groups;
-          }
-          groups.push(cmdName);
-          return groups;
-        }, []);
-        if (functionGroups.length === 0) {
-          consola.warn("No function groups found in cli.json");
-          return;
-        }
-        const selectedGroup = await p.select({
-          message: "Select a project group",
-          options: functionGroups.map((group) => ({
-            label: group,
-            value: group
-          }))
-        });
-        if (!selectedGroup)
-          return;
-        const availableFunctions = [];
-        const scripts = cliJson[selectedGroup];
-        for (const scriptName of Object.keys(scripts)) {
-          const script = scripts[scriptName];
-          if (script && script.type === "function") {
-            availableFunctions.push({
-              command: selectedGroup,
-              script: scriptName,
-              handler: script
-            });
-          }
-        }
-        if (availableFunctions.length === 0) {
-          consola.warn(`No functions found in the ${selectedGroup} group`);
-          return;
-        }
-        const selectedFunction = await p.select({
-          message: `Select a function from ${selectedGroup}`,
-          options: availableFunctions.map((fn, index) => ({
-            label: fn.script,
-            value: index.toString(),
-            hint: fn.handler.description || void 0
-          }))
-        });
-        if (!selectedFunction)
-          return;
-        const selectedIndex = Number.parseInt(selectedFunction, 10);
-        const selectedFunctionObj = availableFunctions[selectedIndex];
-        if (!selectedFunctionObj || !selectedFunctionObj.handler) {
-          consola.error("Selected function not found or invalid");
-          return;
-        }
-        selectedCommands = [{
-          command: selectedFunctionObj.command,
-          script: selectedFunctionObj.script,
-          handler: selectedFunctionObj.handler
-        }];
-      } else {
-        const scripts = cliJson[commandName];
-        const scriptName = await p.select({
-          message: "Select a script to run",
-          options: Object.keys(scripts).filter((key) => !scripts[key].tags?.length).map((key) => ({
-            label: key,
-            value: key
-          }))
-        });
-        if (!scriptName)
-          return;
-        selectedCommands = [{
-          command: commandName,
-          script: scriptName,
-          handler: scripts[scriptName]
-        }];
-      }
+      selectedCommands = commands.filter((cmd) => cmd.when !== false);
     }
-    for (const cmd of selectedCommands) {
-      if (cmd.handler.enabled === false) {
-        continue;
+    const multiSelect = await p.groupMultiselect({
+      message: "Select commands to run",
+      required: true,
+      options: {
+        ...selectedCommands.reduce((acc, cmd) => {
+          acc[cmd.group || ""] = [
+            {
+              label: cmd.name,
+              value: cmd,
+              hint: cmd.description
+            }
+          ];
+          return acc;
+        }, {})
       }
-      if (cmd.handler.type === "command") {
-        execSync(cmd.handler.handler, { stdio: "inherit" });
+    });
+    cancelOnCancel({ value: multiSelect });
+    selectedCommands = multiSelect;
+    const spinner = p.spinner({
+      indicator: "dots"
+    });
+    for (const cmd of selectedCommands) {
+      const data2 = cmd.getContents({ app: silgi });
+      spinner.start(`[${cmd.group}] ${cmd.name}...`);
+      if (cmd.type === "command") {
+        execSync(data2, { stdio: "inherit" });
       }
-      if (cmd.handler.type === "function") {
+      if (cmd.type === "function") {
         const jiti = createJiti(import.meta.url, {
           alias: silgiConfig.alias
         });
-        let cleanHandler = cmd.handler.handler.replace(/\n/g, "");
+        let cleanHandler = cmd.getContents({ app: silgi }).replace(/\n/g, "");
         cleanHandler = `import { silgiCLICtx } from 'silgi' 
         ${cleanHandler}
 `;
@@ -243,6 +173,8 @@ const command$1 = defineCommand({
           forceTranspile: true
         });
       }
+      spinner.stop();
+      consola.success(`[${cmd.group}] ${cmd.name} done`);
     }
     await silgiCLIIClose();
   }

package/dist/cli/silgi.mjs

@@ -1534,49 +1534,6 @@ ${cycleStr}`);
   return order;
 }
 
-async function commands(silgi) {
-  const commands2 = {
-    ...silgi.options.commands
-  };
-  await silgi.callHook("prepare:commands", commands2);
-  addTemplate({
-    filename: "cli.json",
-    where: ".silgi",
-    write: true,
-    getContents: () => JSON.stringify(commands2, null, 2)
-  });
-  silgi.commands = commands2;
-  silgi.hook("prepare:schema.ts", async (object) => {
-    const allTags = Object.values(commands2).reduce((acc, commandGroup) => {
-      Object.values(commandGroup).forEach((command) => {
-        if (command.tags) {
-          command.tags.forEach((tag) => acc.add(tag));
-        }
-      });
-      return acc;
-    }, /* @__PURE__ */ new Set());
-    const data = [
-      "",
-      generateTypes(
-        await resolveSchema(
-          {
-            ...Object.fromEntries(Array.from(allTags.values()).map((tag) => [tag, "string"]))
-          }
-        ),
-        {
-          interfaceName: "SilgiCommandsExtended",
-          addExport: false,
-          addDefaults: false,
-          allowExtraKeys: false,
-          indentation: 0
-        }
-      ),
-      ""
-    ];
-    object.customImports?.push(...data);
-  });
-}
-
 function resolveIgnorePatterns(silgi, relativePath) {
   if (!silgi) {
     return [];
@@ -2306,7 +2263,6 @@ async function createSilgiCLI(config = {}, opts = {}) {
     options,
     hooks,
     errors: [],
-    commands: {},
     _requiredModules: {},
     logger: consola.withTag("silgi"),
     close: () => silgi.hooks.callHook("close", silgi),
@@ -2363,7 +2319,6 @@ async function createSilgiCLI(config = {}, opts = {}) {
   silgi.hooks.addHooks(silgi.options.hooks);
   await installModules(silgi);
   await silgi.hooks.callHook("scanFiles:done", silgi);
-  await commands(silgi);
   await generateApp(silgi);
   if (silgi.options.imports) {
     silgi.options.imports.dirs ??= [];

package/dist/cli/types.mjs

@@ -126,7 +126,6 @@ const SilgiCLIDefaults = {
   conditions: [],
   nodeModulesDirs: [],
   hooks: {},
-  commands: {},
   // Framework
   framework: {
     name: "h3",

package/dist/kit/index.d.mts

@@ -1,9 +1,11 @@
-import { SilgiCLI, ModuleOptionsCustom, ModuleDefinition, SilgiModule, ServiceParseModule, SilgiPreset, SilgiPresetMeta, SilgiTemplate, ResolvedSilgiTemplate, SilgiEvents } from 'silgi/types';
+import { Commands, SilgiCLI, ModuleOptionsCustom, ModuleDefinition, SilgiModule, ServiceParseModule, SilgiPreset, SilgiPresetMeta, SilgiTemplate, ResolvedSilgiTemplate, SilgiEvents } from 'silgi/types';
 import { Buffer } from 'node:buffer';
 import { ConsolaOptions, ConsolaInstance } from 'consola';
 import * as rfc6902 from 'rfc6902';
 import { IncomingMessage, ServerResponse } from 'node:http';
 
+declare function addCommands(data: Commands | Commands[]): Promise<void>;
+
 declare function addNPMPackage(data: {
     name: string;
     version?: string;
@@ -269,7 +271,6 @@ declare function getIpAddress(event: SilgiEvents): string | boolean;
 declare function ipAddress(req: IncomingMessage): string;
 
 declare function relativeWithDot(from: string, to: string): string;
-/** @since 3.9.0 */
 declare function toArray<T>(value: T | T[]): T[];
 /**
  * Filter out items from an array in place. This function mutates the array.
@@ -290,5 +291,5 @@ declare function hasInstalledModule(moduleKey: string, silgi?: SilgiCLI): boolea
 declare const baseHeaderBannerComment: string[];
 declare function processFilePath(src: string): string;
 
-export { MODE_RE, MigrationStatus, addNPMPackage, addTemplate, baseHeaderBannerComment, createFunction, createFunctionConfigs, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, formatFunctions, genEnsureSafeVar, generateMigration, getAllEntries, getIpAddress, getMigration, hasError, hasInstalledModule, hasSilgiModule, hash, ipAddress, isDirectory, isH3, isNitro, isNuxt, listMigrations, migrationDown, migrationUp, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };
+export { MODE_RE, MigrationStatus, addCommands, addNPMPackage, addTemplate, baseHeaderBannerComment, createFunction, createFunctionConfigs, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, formatFunctions, genEnsureSafeVar, generateMigration, getAllEntries, getIpAddress, getMigration, hasError, hasInstalledModule, hasSilgiModule, hash, ipAddress, isDirectory, isH3, isNitro, isNuxt, listMigrations, migrationDown, migrationUp, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };
 export type { FunctionConfig, JsonPatch, MigrationData, MigrationInfo, MigrationOptions, MigrationResult };

package/dist/kit/index.mjs

@@ -1,11 +1,11 @@
+import { u as useSilgiCLI$1 } from '../_chunks/silgiApp.mjs';
+import { relative, resolve, dirname, join, normalize, isAbsolute, parse, basename } from 'pathe';
+import { useSilgiCLI, tryUseSilgiCLI, useSilgi } from 'silgi';
 import { execSync } from 'node:child_process';
-import { u as useSilgiCLI } from '../_chunks/silgiApp.mjs';
-import { tryUseSilgiCLI, useSilgiCLI as useSilgiCLI$1, useSilgi } from 'silgi';
 import { pathToFileURL, fileURLToPath } from 'node:url';
 import { resolvePath as resolvePath$1 } from 'mlly';
 import fsp, { mkdir, readFile, writeFile as writeFile$1 } from 'node:fs/promises';
 import consola, { consola as consola$1 } from 'consola';
-import { relative, resolve, dirname, join, normalize, isAbsolute, parse, basename } from 'pathe';
 import { colors } from 'consola/utils';
 import { getProperty } from 'dot-prop';
 import { genString, genObjectFromRaw, genObjectFromValues, genObjectFromRawEntries } from 'knitwork';
@@ -22,9 +22,54 @@ import 'unctx';
 import 'semver/functions/satisfies.js';
 import 'silgi/meta';
 
+const RELATIVE_RE = /^([^.])/;
+function relativeWithDot(from, to) {
+  return relative(from, to).replace(RELATIVE_RE, "./$1") || ".";
+}
+function toArray(value) {
+  return Array.isArray(value) ? value : [value];
+}
+function filterInPlace(array, predicate) {
+  for (let i = array.length; i--; i >= 0) {
+    if (!predicate(array[i], i, array)) {
+      array.splice(i, 1);
+    }
+  }
+  return array;
+}
+const MODE_RE = /\.(server|client)(\.\w+)*$/;
+function hasSilgiModule(moduleKey, silgi = useSilgiCLI()) {
+  return silgi.scanModules.some(({ meta }) => meta.configKey === moduleKey) || Object.keys(silgi.scanModules).includes(moduleKey);
+}
+function hasInstalledModule(moduleKey, silgi = useSilgiCLI()) {
+  const find = silgi.scanModules.find(({ meta }) => meta.configKey === moduleKey);
+  return find?.installed ?? false;
+}
+const baseHeaderBannerComment = [
+  "// DO NOT EDIT THIS FILE",
+  "// This file is generated by Silgi",
+  "/* eslint-disable */",
+  "/* prettier-ignore */",
+  "/* tslint:disable */"
+];
+function processFilePath(src) {
+  const silgi = useSilgiCLI();
+  if (silgi.options.typescript.removeFileExtension) {
+    src = src.replace(/\.ts$/, "");
+    return src;
+  }
+  return src;
+}
+
+async function addCommands(data) {
+  useSilgiCLI$1().hook("prepare:commands", (commads) => {
+    commads.push(...toArray(data));
+  });
+}
+
 const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 async function addNPMPackage(data) {
-  const silgi = useSilgiCLI();
+  const silgi = useSilgiCLI$1();
   for (const item of data) {
     if (item.when === false) {
       continue;
@@ -96,7 +141,7 @@ function _compilePathTemplate(contents) {
 }
 
 async function writeFile(file, contents, log = false) {
-  const silgi = useSilgiCLI$1();
+  const silgi = useSilgiCLI();
   if (silgi.errors.length) {
     return;
   }
@@ -599,7 +644,7 @@ function _defineSilgiModule(definition) {
   }
   const module = defu(definition, { meta: {} });
   module.meta.configKey ||= module.meta.name;
-  async function getOptions(inlineOptions, silgi = useSilgiCLI$1()) {
+  async function getOptions(inlineOptions, silgi = useSilgiCLI()) {
     const nuxtConfigOptionsKey = module.meta.configKey || module.meta.name;
     const nuxtConfigOptions = nuxtConfigOptionsKey && nuxtConfigOptionsKey in silgi.options ? silgi.options[nuxtConfigOptionsKey] : {};
     const optionsDefaults = typeof module.defaults === "function" ? await module.defaults(silgi) : module.defaults ?? {};
@@ -783,47 +828,8 @@ async function resolveSilgiModule(base, paths) {
   return resolved;
 }
 
-const RELATIVE_RE = /^([^.])/;
-function relativeWithDot(from, to) {
-  return relative(from, to).replace(RELATIVE_RE, "./$1") || ".";
-}
-function toArray(value) {
-  return Array.isArray(value) ? value : [value];
-}
-function filterInPlace(array, predicate) {
-  for (let i = array.length; i--; i >= 0) {
-    if (!predicate(array[i], i, array)) {
-      array.splice(i, 1);
-    }
-  }
-  return array;
-}
-const MODE_RE = /\.(server|client)(\.\w+)*$/;
-function hasSilgiModule(moduleKey, silgi = useSilgiCLI$1()) {
-  return silgi.scanModules.some(({ meta }) => meta.configKey === moduleKey) || Object.keys(silgi.scanModules).includes(moduleKey);
-}
-function hasInstalledModule(moduleKey, silgi = useSilgiCLI$1()) {
-  const find = silgi.scanModules.find(({ meta }) => meta.configKey === moduleKey);
-  return find?.installed ?? false;
-}
-const baseHeaderBannerComment = [
-  "// DO NOT EDIT THIS FILE",
-  "// This file is generated by Silgi",
-  "/* eslint-disable */",
-  "/* prettier-ignore */",
-  "/* tslint:disable */"
-];
-function processFilePath(src) {
-  const silgi = useSilgiCLI$1();
-  if (silgi.options.typescript.removeFileExtension) {
-    src = src.replace(/\.ts$/, "");
-    return src;
-  }
-  return src;
-}
-
 function addTemplate(_template) {
-  const silgi = useSilgiCLI$1();
+  const silgi = useSilgiCLI();
   const template = normalizeTemplate(_template);
   filterInPlace(silgi.options.build.templates, (p) => normalizeTemplate(p).dst !== template.dst);
   silgi.options.build.templates.push(template);
@@ -857,7 +863,7 @@ function normalizeTemplate(template, buildDir) {
     template.write = true;
   }
   if (!template.dst) {
-    const silgi = useSilgiCLI$1();
+    const silgi = useSilgiCLI();
     const dir = template.where === ".silgi" ? silgi.options.build.dir : template.where === "server" ? silgi.options.silgi.serverDir : template.where === "client" ? silgi.options.silgi.clientDir : silgi.options.silgi.serverDir;
     template.dst = resolve(buildDir ?? dir, template.filename);
   }
@@ -952,4 +958,4 @@ function isValidIp(ip) {
   return false;
 }
 
-export { MODE_RE, MigrationStatus, addNPMPackage, addTemplate, baseHeaderBannerComment, createFunction, createFunctionConfigs, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, formatFunctions, genEnsureSafeVar, generateMigration, getAllEntries, getIpAddress, getMigration, hasError, hasInstalledModule, hasSilgiModule, hash, ipAddress, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, listMigrations, migrationDown, migrationUp, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };
+export { MODE_RE, MigrationStatus, addCommands, addNPMPackage, addTemplate, baseHeaderBannerComment, createFunction, createFunctionConfigs, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, formatFunctions, genEnsureSafeVar, generateMigration, getAllEntries, getIpAddress, getMigration, hasError, hasInstalledModule, hasSilgiModule, hash, ipAddress, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, listMigrations, migrationDown, migrationUp, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };

package/dist/types/index.d.mts

@@ -47,8 +47,6 @@ interface ImportItem {
     customImports: string[];
     customContent?: string[];
 }
-interface SilgiCommands {
-}
 interface SilgiCLI {
     _ignore?: Ignore;
     errors: {
@@ -82,13 +80,6 @@ interface SilgiCLI {
     }>;
     options: SilgiCLIOptions;
     _requiredModules: Record<string, boolean>;
-    commands: Record<string, Record<string, {
-        type: 'function' | 'command';
-        handler: string;
-        description?: string;
-        tags?: (keyof SilgiCommands)[];
-        enabled?: boolean;
-    }>>;
     adapters: Record<string, Adapter<Record<string, any>, TablesSchema, InferModelTypes<TablesSchema>>>;
 }
 type SilgiCLIDynamicConfig = Pick<SilgiCLIConfig, 'routeRules'>;
@@ -605,7 +596,9 @@ interface SilgiCLIOptions extends PresetOptions {
     modules: (SilgiModule<any> | string | [SilgiModule | string, Record<string, any>] | undefined | null | false)[];
     _modules: (SilgiModule<any> | string | [SilgiModule | string, Record<string, any>] | undefined | null | false)[];
     isPreparingModules: boolean;
-    debug: boolean;
+    debug: true | {
+        command?: boolean;
+    };
     preset: PresetName;
     static: boolean;
     logLevel: LogLevel;
@@ -805,11 +798,6 @@ interface SilgiCLIOptions extends PresetOptions {
      * ```
      */
     ignoreOptions: Options;
-    commands: Record<string, Record<string, {
-        type: 'function' | 'command';
-        handler: string;
-        description?: string;
-    }>>;
     installPackages: Record<'dependencies' | 'devDependencies', Record<string, string>>;
     apiFul: ApifulConfig;
     adapters: Record<string, Adapter<Record<string, any>, TablesSchema, InferModelTypes<TablesSchema>>>;
@@ -1159,6 +1147,20 @@ interface GraphQLJSON {
     references: any;
 }
 
+interface SilgiCommands {
+}
+interface Commands {
+    name: string;
+    description?: string;
+    group: string;
+    when?: boolean;
+    type: 'function' | 'command';
+    tags?: (keyof SilgiCommands)[] | (string | object)[];
+    getContents: (data: {
+        app: SilgiCLI;
+    }) => string;
+}
+
 interface BaseNamespaceType extends Record<keyof DefaultNamespaces, Record<string, BaseSchemaType<StandardSchemaV1>>> {
 }
 type Namespaces<T extends BaseNamespaceType> = {
@@ -1178,4 +1180,4 @@ interface ServiceParseModule {
     (params: ServiceParse): Awaited<void> | void;
 }
 
-export type { AllPaths, AppConfig, Awaitable, BaseNamespaceType, BaseSchemaType, BaseSilgiMethodType, CaptureError, CapturedErrorContext, CommandType, CreateScope, DeepPartial, DeepRequired, DefaultHooks, DefaultNamespaces, DefaultRouteConfig, DefaultRouteRules, DotenvOptions, EnvOptions, EventHandlerResponse, ExtendContext, ExtendShared, ExtractInputFromURI, ExtractOutputFromURI, ExtractPathParams, ExtractPathParamsFromURI, ExtractQueryParamsFromURI, ExtractSourceFromURI, FrameworkContext, GenerateAppOptions, GraphQLJSON, HookResult, HttpMethod, ImportItem, LoadConfigOptions, MergedSilgiSchema, MethodHandlerType, ModuleDefinition, ModuleHookContext, ModuleMeta, ModuleOptionsCustom, ModuleSetupInstallResult, ModuleSetupReturn, Namespaces, NitroBuildInfo, PrepareCore, RequiredServiceType, ResolvedMethodHandlerType, ResolvedModuleMeta, ResolvedModuleOptions, ResolvedServiceType, ResolvedSilgiTemplate, RouteRules, RouterParams, ScanFile, ServiceParse, ServiceParseModule, ServiceType, Silgi, SilgiAppPlugin, SilgiCLI, SilgiCLIConfig, SilgiCLIDynamicConfig, SilgiCLIHooks, SilgiCLIOptions, SilgiCommands, SilgiCompatibility, SilgiCompatibilityIssue, SilgiCompatibilityIssues, SilgiConfig, SilgiEvents, SilgiFetchClient, SilgiFetchOptions, SilgiFrameworkInfo, SilgiFunction, SilgiHooks, SilgiModule, SilgiModuleInput, SilgiModuleOptions, SilgiNamespaces, SilgiOperation, SilgiOptions, SilgiPreset, SilgiPresetMeta, SilgiRouteRules, SilgiRouterTypes, SilgiRuntimeActions, SilgiRuntimeConfig, SilgiRuntimeContext, SilgiRuntimeHooks, SilgiRuntimeMethods, SilgiRuntimeOptions, SilgiRuntimeRouteRules, SilgiRuntimeRouteRulesConfig, SilgiRuntimeShareds, SilgiRuntimeSharedsExtend, SilgiSchema, SilgiServiceInterface, SilgiStorageBase, SilgiTemplate, SilgiURIs, StorageConfig, StorageKeyGenerator, StorageKeyParams, StorageMounts, TSReference, TrimAfterFourSlashes, URIsTypes };
+export type { AllPaths, AppConfig, Awaitable, BaseNamespaceType, BaseSchemaType, BaseSilgiMethodType, CaptureError, CapturedErrorContext, CommandType, Commands, CreateScope, DeepPartial, DeepRequired, DefaultHooks, DefaultNamespaces, DefaultRouteConfig, DefaultRouteRules, DotenvOptions, EnvOptions, EventHandlerResponse, ExtendContext, ExtendShared, ExtractInputFromURI, ExtractOutputFromURI, ExtractPathParams, ExtractPathParamsFromURI, ExtractQueryParamsFromURI, ExtractSourceFromURI, FrameworkContext, GenerateAppOptions, GraphQLJSON, HookResult, HttpMethod, ImportItem, LoadConfigOptions, MergedSilgiSchema, MethodHandlerType, ModuleDefinition, ModuleHookContext, ModuleMeta, ModuleOptionsCustom, ModuleSetupInstallResult, ModuleSetupReturn, Namespaces, NitroBuildInfo, PrepareCore, RequiredServiceType, ResolvedMethodHandlerType, ResolvedModuleMeta, ResolvedModuleOptions, ResolvedServiceType, ResolvedSilgiTemplate, RouteRules, RouterParams, ScanFile, ServiceParse, ServiceParseModule, ServiceType, Silgi, SilgiAppPlugin, SilgiCLI, SilgiCLIConfig, SilgiCLIDynamicConfig, SilgiCLIHooks, SilgiCLIOptions, SilgiCommands, SilgiCompatibility, SilgiCompatibilityIssue, SilgiCompatibilityIssues, SilgiConfig, SilgiEvents, SilgiFetchClient, SilgiFetchOptions, SilgiFrameworkInfo, SilgiFunction, SilgiHooks, SilgiModule, SilgiModuleInput, SilgiModuleOptions, SilgiNamespaces, SilgiOperation, SilgiOptions, SilgiPreset, SilgiPresetMeta, SilgiRouteRules, SilgiRouterTypes, SilgiRuntimeActions, SilgiRuntimeConfig, SilgiRuntimeContext, SilgiRuntimeHooks, SilgiRuntimeMethods, SilgiRuntimeOptions, SilgiRuntimeRouteRules, SilgiRuntimeRouteRulesConfig, SilgiRuntimeShareds, SilgiRuntimeSharedsExtend, SilgiSchema, SilgiServiceInterface, SilgiStorageBase, SilgiTemplate, SilgiURIs, StorageConfig, StorageKeyGenerator, StorageKeyParams, StorageMounts, TSReference, TrimAfterFourSlashes, URIsTypes };

package/package.json

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