silgi 0.28.12 → 0.29.1

package/dist/cli/index.mjs

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

package/dist/cli/prepare.mjs

@@ -135,14 +135,15 @@ const command$1 = defineCommand({
       message: "Select commands to run",
       required: true,
       options: {
-        ...selectedCommands.reduce((acc, cmd) => {
-          acc[cmd.group || ""] = [
-            {
-              label: cmd.name,
-              value: cmd,
-              hint: cmd.description
-            }
-          ];
+        ...selectedCommands.sort((a, b) => (a.order || Infinity) - (b.order || Infinity)).reduce((acc, cmd) => {
+          if (!acc[cmd.group || ""]) {
+            acc[cmd.group || ""] = [];
+          }
+          acc[cmd.group || ""].push({
+            label: cmd.name,
+            value: cmd,
+            hint: cmd.description
+          });
           return acc;
         }, {})
       }

package/dist/cli/silgi.mjs

@@ -2293,6 +2293,7 @@ async function createSilgiCLI(config = {}, opts = {}) {
     silgiCLICtx.set(silgi);
     silgi.hook("close", () => silgiCLICtx.unset());
   }
+  await silgi.hooks.callHook("ready", silgi);
   if (silgi.options.debug) {
     createDebugger(silgi.hooks, { tag: "silgi" });
     silgi.options.plugins.push({

package/dist/cli/types.mjs

@@ -1,7 +1,7 @@
 import { watchConfig, loadConfig } from 'c12';
 import { resolveCompatibilityDatesFromEnv, formatDate, resolveCompatibilityDates } from 'compatx';
 import { klona } from 'klona/full';
-import { isDebug, isTest } from 'std-env';
+import { isTest, isDebug } from 'std-env';
 import consola from 'consola';
 import { colors } from 'consola/utils';
 import { relative, join, resolve, dirname, isAbsolute } from 'pathe';
@@ -16,7 +16,7 @@ import { defu } from 'defu';
 
 const SilgiCLIDefaults = {
   // General
-  debug: isDebug,
+  debug: isDebug === true ? true : void 0,
   // timing: isDebug,
   logLevel: isTest ? 1 : 3,
   // runtimeConfig: { app: {}, silgi: {} },

package/dist/kit/index.d.mts

@@ -1,15 +1,22 @@
-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;
     isDev?: boolean;
     when?: boolean;
-}[]): Promise<void>;
+}[] | {
+    name: string;
+    version?: string;
+    isDev?: boolean;
+    when?: boolean;
+}): Promise<void>;
 
 declare function hasError(type: SilgiCLI['errors'][0]['type'], silgi?: SilgiCLI): boolean;
 
@@ -289,5 +296,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,10 +22,55 @@ 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();
-  for (const item of data) {
+  const silgi = useSilgiCLI$1();
+  for (const item of toArray(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/presets/h3/preset.mjs

@@ -1,5 +1,4 @@
-import { defineSilgiPreset } from "silgi/kit";
-import { peerDependencies } from "silgi/meta";
+import { addNPMPackage, defineSilgiPreset } from "silgi/kit";
 const h3 = defineSilgiPreset(
   {
     static: true,
@@ -11,11 +10,11 @@ const h3 = defineSilgiPreset(
       crawlLinks: true
     },
     hooks: {
-      "prepare:installPackages": async (packages) => {
-        packages.dependencies = {
-          ...packages.dependencies,
-          h3: peerDependencies.h3
-        };
+      ready: async () => {
+        await addNPMPackage({
+          name: "h3",
+          isDev: true
+        });
       }
     }
   },

package/dist/presets/nitro/preset.mjs

@@ -1,5 +1,4 @@
-import { defineSilgiPreset } from "silgi/kit";
-import { peerDependencies } from "silgi/meta";
+import { addNPMPackage, defineSilgiPreset } from "silgi/kit";
 const nitro = defineSilgiPreset(
   {
     static: true,
@@ -26,11 +25,11 @@ const nitro = defineSilgiPreset(
       ]
     },
     hooks: {
-      "prepare:installPackages": async (packages) => {
-        packages.dependencies = {
-          ...packages.dependencies,
-          h3: peerDependencies.h3
-        };
+      ready: async () => {
+        await addNPMPackage({
+          name: "h3",
+          isDev: true
+        });
       }
     },
     storages: ["data", "/assets"]

package/dist/presets/nuxt/preset.mjs

@@ -1,5 +1,4 @@
-import { defineSilgiPreset } from "silgi/kit";
-import { peerDependencies } from "silgi/meta";
+import { addNPMPackage, defineSilgiPreset } from "silgi/kit";
 const nuxt = defineSilgiPreset(
   {
     static: true,
@@ -27,11 +26,11 @@ const nuxt = defineSilgiPreset(
       ]
     },
     hooks: {
-      "prepare:installPackages": async (packages) => {
-        packages.dependencies = {
-          ...packages.dependencies,
-          h3: peerDependencies.h3
-        };
+      ready: async () => {
+        await addNPMPackage({
+          name: "h3",
+          isDev: true
+        });
       }
     },
     storages: ["data", "/assets"]

package/dist/types/index.d.mts

@@ -147,6 +147,21 @@ interface ResolvedSilgiTemplate<Options = TemplateDefaultOptions> extends SilgiT
     modified?: boolean;
 }
 
+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;
+    order?: number;
+}
+
 interface SilgiCLIHooks extends SilgiHooks {
     /**
      * Called after Silgi initialization, when the Silgi instance is ready to work.
@@ -263,7 +278,7 @@ interface SilgiCLIHooks extends SilgiHooks {
      */
     'app:templatesGenerated': (app: SilgiCLI, templates: ResolvedSilgiTemplate[], options?: GenerateAppOptions) => HookResult;
     'scanFiles:done': (app: SilgiCLI) => HookResult;
-    'prepare:commands': (commands: SilgiCLI['commands']) => HookResult;
+    'prepare:commands': (commands: Commands[]) => HookResult;
 }
 type TSReference = {
     types: string;
@@ -1147,20 +1162,6 @@ 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> = {

package/package.json

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