silgi 0.19.29 → 0.19.30

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.19.29";
+const version = "0.19.30";
 const peerDependencies = {
 	"@fastify/deepmerge": "^3.0.0",
 	"@nuxt/kit": "^3.15.3",

package/dist/cli/common.mjs

@@ -157,13 +157,21 @@ async function h3Framework(silgi, skip = false) {
   silgi.hook("prepare:schema.ts", (data) => {
     data.importItems.nitropack = {
       import: [
-        { name: "NitroApp", type: true }
+        {
+          name: "NitroApp",
+          type: true,
+          key: "NitroApp"
+        }
       ],
       from: "nitropack/types"
     };
     data.importItems.h3 = {
       import: [
-        { name: "H3Event", type: true }
+        {
+          name: "H3Event",
+          type: true,
+          key: "H3Event"
+        }
       ],
       from: "h3"
     };
@@ -177,7 +185,11 @@ async function h3Framework(silgi, skip = false) {
   silgi.hook("prepare:createDTSFramework", (data) => {
     data.importItems["silgi/types"] = {
       import: [
-        { name: "SilgiRuntimeContext", type: true }
+        {
+          name: "SilgiRuntimeContext",
+          type: true,
+          key: "SilgiRuntimeContext"
+        }
       ],
       from: "silgi/types"
     };
@@ -724,8 +736,8 @@ async function commands(silgi) {
     write: true,
     getContents: () => JSON.stringify(commands2, null, 2)
   });
+  silgi.commands = commands2;
   silgi.hook("prepare:schema.ts", async (object) => {
-    console.log("prepare:schema.ts");
     const allTags = Object.values(commands2).reduce((acc, commandGroup) => {
       Object.values(commandGroup).forEach((command) => {
         if (command.tags) {
@@ -1586,7 +1598,7 @@ async function createSilgiCLI(config = {}, opts = {}) {
     options,
     hooks,
     errors: [],
-    // vfs: {}
+    commands: {},
     _requiredModules: {},
     logger: consola.withTag("silgi"),
     close: () => silgi.hooks.callHook("close", silgi),

package/dist/cli/prepare.mjs

@@ -122,14 +122,18 @@ const run = defineCommand({
     const data = args.active ? await runCommand(prepare, {
       rawArgs: ["--commands", "run"]
     }) : void 0;
-    if (data?.result?.silgi) {
-      console.log("Setting silgi context");
+    if (!data?.result?.silgi) {
+      consola.error("Silgi not found");
+      return;
+    }
+    const silgi = data.result.silgi;
+    if (silgi) {
       if (silgiCLICtx.tryUse()) {
         silgiCLICtx.unset();
-        silgiCLICtx.set(data.result.silgi);
+        silgiCLICtx.set(silgi);
       } else {
-        silgiCLICtx.set(data.result.silgi);
-        data.result.silgi.hook("close", () => silgiCLICtx.unset());
+        silgiCLICtx.set(silgi);
+        silgi.hook("close", () => silgiCLICtx.unset());
       }
     }
     const tags = args.tag?.split(",").map((t) => t.trim());
@@ -162,34 +166,72 @@ const run = defineCommand({
         consola.warn("No commands found in cli.json");
         return;
       }
+      const allTags = Object.values(silgi.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 commandName = await p.select({
         message: "Select a command to run",
-        options: Object.keys(cliJson).filter((key) => {
-          const scripts2 = cliJson[key];
-          const scriptValues = Object.values(scripts2);
-          return scriptValues;
-        }).map((key) => ({
-          label: key,
-          value: key
-        }))
+        options: [
+          ...allTags.size ? [{
+            value: "command-tags",
+            label: "Command Tags",
+            hint: "It executes all commands that are related to the tags you select."
+          }] : [],
+          ...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;
-      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]
-      }];
+      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 {
+        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]
+        }];
+      }
     }
     for (const cmd of selectedCommands) {
       consola.info(`Running ${cmd.command}:${cmd.script}...`);
@@ -204,7 +246,7 @@ const run = defineCommand({
           alias: silgiConfig.alias
         });
         let cleanHandler = cmd.handler.handler.replace(/\n/g, "");
-        global.__silgi_temp_obj = data?.result?.silgi;
+        global.__silgi_temp_obj = silgi;
         cleanHandler = `import { silgiCLICtx } from 'silgi/core' 
 
       // Access from global scope

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.19.29";
+const version = "0.19.30";
 const peerDependencies = {
 	"@fastify/deepmerge": "^3.0.0",
 	"@nuxt/kit": "^3.15.3",

package/dist/meta/index.d.ts

@@ -1,4 +1,4 @@
-const version = "0.19.29";
+const version = "0.19.30";
 const peerDependencies = {
 	"@fastify/deepmerge": "^3.0.0",
 	"@nuxt/kit": "^3.15.3",

package/dist/types/index.d.mts

@@ -76,6 +76,13 @@ 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;
+    }>>;
 }
 type SilgiCLIDynamicConfig = Pick<SilgiCLIConfig, 'routeRules'>;
 interface SilgiFrameworkInfo {
@@ -277,13 +284,7 @@ interface SilgiCLIHooks extends SilgiHooks {
      */
     'app:templatesGenerated': (app: SilgiCLI, templates: ResolvedSilgiTemplate[], options?: GenerateAppOptions) => HookResult;
     'scanFiles:done': (app: SilgiCLI) => HookResult;
-    'prepare:commands': (commands: Record<string, Record<string, {
-        type: 'function' | 'command';
-        handler: string;
-        description?: string;
-        tags?: (keyof SilgiCommands)[];
-        enabled?: boolean;
-    }>>) => HookResult;
+    'prepare:commands': (commands: SilgiCLI['commands']) => HookResult;
     'prepare:installPackages': (packages: Record<'dependencies' | 'devDependencies', Record<string, string>>) => HookResult;
 }
 

package/dist/types/index.d.ts

@@ -76,6 +76,13 @@ 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;
+    }>>;
 }
 type SilgiCLIDynamicConfig = Pick<SilgiCLIConfig, 'routeRules'>;
 interface SilgiFrameworkInfo {
@@ -277,13 +284,7 @@ interface SilgiCLIHooks extends SilgiHooks {
      */
     'app:templatesGenerated': (app: SilgiCLI, templates: ResolvedSilgiTemplate[], options?: GenerateAppOptions) => HookResult;
     'scanFiles:done': (app: SilgiCLI) => HookResult;
-    'prepare:commands': (commands: Record<string, Record<string, {
-        type: 'function' | 'command';
-        handler: string;
-        description?: string;
-        tags?: (keyof SilgiCommands)[];
-        enabled?: boolean;
-    }>>) => HookResult;
+    'prepare:commands': (commands: SilgiCLI['commands']) => HookResult;
     'prepare:installPackages': (packages: Record<'dependencies' | 'devDependencies', Record<string, string>>) => HookResult;
 }
 

package/package.json

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