silgi 0.29.0 → 0.29.2

package/dist/cli/dev.mjs

@@ -6,7 +6,7 @@ import { join } from 'pathe';
 import { useSilgiCLI } from 'silgi';
 import { version } from 'silgi/meta';
 import { a as silgiCLIIClose } from '../_chunks/silgiApp.mjs';
-import { a as commonArgs, c as command } from './prepare.mjs';
+import { c as commonArgs, p as prepare } from './prepare.mjs';
 import 'unctx';
 import './silgi.mjs';
 import 'apiful/openapi';
@@ -70,7 +70,7 @@ const dev = defineCommand({
     }
   },
   async run() {
-    await runCommand(command, {
+    await runCommand(prepare, {
       rawArgs: ["--commands", "run", "--dev", "true"]
     });
     const silgi = useSilgiCLI();
@@ -103,7 +103,7 @@ const dev = defineCommand({
         silgi.errors = [];
         try {
           await reloadScan(path, stats);
-          await runCommand(command, {
+          await runCommand(prepare, {
             rawArgs: ["--commands", "run", "--dev", "true"]
           });
         } catch (error) {

package/dist/cli/index.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { defineCommand, runMain } from 'citty';
 
-const version = "0.29.0";
+const version = "0.29.2";
 const packageJson = {
 	version: version};
 
@@ -18,7 +18,7 @@ const main = defineCommand({
     }
   },
   subCommands: {
-    prepare: () => import('./prepare.mjs').then(function (n) { return n.p; }).then((m) => m.default),
+    prepare: () => import('./prepare.mjs').then(function (n) { return n.a; }).then((m) => m.default),
     init: () => import('./init.mjs').then((m) => m.default),
     run: () => import('./prepare.mjs').then(function (n) { return n.r; }).then((m) => m.default),
     install: () => import('./install.mjs').then((m) => m.default),

package/dist/cli/init.mjs

@@ -4,7 +4,7 @@ import * as p from '@clack/prompts';
 import { defineCommand, runCommand } from 'citty';
 import consola from 'consola';
 import { dirname } from 'pathe';
-import { c as command$1 } from './prepare.mjs';
+import { p as prepare } from './prepare.mjs';
 import 'silgi/meta';
 import './silgi.mjs';
 import 'apiful/openapi';
@@ -45,7 +45,7 @@ import 'node:child_process';
 import '../_chunks/silgiApp.mjs';
 import 'unctx';
 
-const command = defineCommand({
+const init = defineCommand({
   meta: {
     name: "Silgi Init",
     description: "Initialize silgi config",
@@ -100,7 +100,7 @@ const command = defineCommand({
       await fsp.mkdir(dirname(file), { recursive: true });
       writeFileSync(file, plugin.join("\n"));
       consola.success("Silgi plugin created, see server/plugins/silgi.ts");
-      runCommand(command$1, {
+      runCommand(prepare, {
         rawArgs: ["--env", ".env"]
       });
     }
@@ -109,4 +109,4 @@ const command = defineCommand({
   }
 });
 
-export { command as default };
+export { init as default };

package/dist/cli/install.mjs

@@ -6,7 +6,7 @@ import { resolve } from 'pathe';
 import { version } from 'silgi/meta';
 import { addNPMPackage, addTemplate } from 'silgi/kit';
 import { u as useSilgiCLI } from '../_chunks/silgiApp.mjs';
-import { a as commonArgs, c as command$1 } from './prepare.mjs';
+import { c as commonArgs, p as prepare } from './prepare.mjs';
 import { l as loadOptions } from './types.mjs';
 import 'unctx';
 import './silgi.mjs';
@@ -83,7 +83,7 @@ async function installPackages(silgi = useSilgiCLI()) {
   });
 }
 
-const command = defineCommand({
+const install = defineCommand({
   meta: {
     name: "install",
     description: "Install dependencies from the install.json file.",
@@ -97,7 +97,7 @@ const command = defineCommand({
     }
   },
   async run() {
-    await runCommand(command$1, {
+    await runCommand(prepare, {
       rawArgs: []
     }).catch(() => {
     });
@@ -130,4 +130,4 @@ const command = defineCommand({
   }
 });
 
-export { command as default };
+export { install as default };

package/dist/cli/prepare.mjs

@@ -91,7 +91,7 @@ function cancelOnCancel({
     handleCancel();
 }
 
-const command$1 = defineCommand({
+const run = defineCommand({
   meta: {
     name: "run",
     description: "Run a command from the CLI",
@@ -113,7 +113,7 @@ const command$1 = defineCommand({
     }
   },
   async run({ args }) {
-    const data = args.active ? await runCommand(command, {
+    const data = args.active ? await runCommand(prepare, {
       rawArgs: ["--commands", "run"]
     }) : void 0;
     const silgi = useSilgiCLI$1();
@@ -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;
         }, {})
       }
@@ -180,12 +181,12 @@ const command$1 = defineCommand({
   }
 });
 
-const run = {
+const run$1 = {
   __proto__: null,
-  default: command$1
+  default: run
 };
 
-const command = defineCommand({
+const prepare = defineCommand({
   meta: {
     name: "prepare",
     description: "Generate types for the project",
@@ -212,6 +213,10 @@ const command = defineCommand({
     commands: {
       type: "string",
       description: "The commands to run"
+    },
+    command_type: {
+      type: "string",
+      description: "The command type to run"
     }
   },
   async run({ args }) {
@@ -221,12 +226,12 @@ const command = defineCommand({
       dev: args.dev || args.stub,
       stub: args.stub,
       preset: args.preset,
-      commandType: "prepare",
+      commandType: args.command_type || "prepare",
       activeEnvironment: args.env
     });
     await build(silgi);
     if (!args.commands) {
-      await runCommand(command$1, {
+      await runCommand(run, {
         rawArgs: ["--tag", "init", "--active", "false"]
       });
     }
@@ -236,9 +241,9 @@ const command = defineCommand({
   }
 });
 
-const prepare = {
+const prepare$1 = {
   __proto__: null,
-  default: command
+  default: prepare
 };
 
-export { commonArgs as a, command as c, prepare as p, run as r };
+export { prepare$1 as a, commonArgs as c, prepare as p, run$1 as r };

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

@@ -11,7 +11,12 @@ declare function addNPMPackage(data: {
     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;
 

package/dist/kit/index.mjs

@@ -70,7 +70,10 @@ async function addCommands(data) {
 const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 async function addNPMPackage(data) {
   const silgi = useSilgiCLI$1();
-  for (const item of data) {
+  if (silgi.options.commandType !== "install") {
+    return;
+  }
+  for (const item of toArray(data)) {
     if (item.when === false) {
       continue;
     }

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;
@@ -519,7 +534,7 @@ interface SilgiRuntimeMethods {
 }
 interface SilgiNamespaces {
 }
-type CommandType = 'run' | 'prepare' | 'install';
+type CommandType = 'run' | 'prepare' | 'install' | 'dev' | 'init';
 interface DefaultNamespaces extends SilgiNamespaces {
 }
 interface SilgiRouterTypes {
@@ -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.29.0",
+  "version": "0.29.2",
   "private": false,
   "sideEffects": false,
   "exports": {