silgi 0.8.0 → 0.8.2

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.8.0";
+const version = "0.8.2";
 const packageJson = {
 	version: version};
 

package/dist/cli/prepare.mjs

@@ -1537,17 +1537,14 @@ async function compileTemplate(template, ctx) {
 
 async function commands(silgi) {
   const commands2 = {
-    module1: {
-      dev: 'echo "module  dev"',
-      build: 'echo "module build"'
-    }
+    ...silgi.options.commands
   };
   await silgi.callHook("prepare:commands", commands2);
   addTemplate({
     filename: "cli.json",
     where: ".silgi",
     write: true,
-    getContents: () => JSON.stringify(commands2, null, 2)
+    getContents: () => Object.keys(commands2).length > 1 ? JSON.stringify(commands2, null, 2) : "{}"
   });
 }
 

package/dist/cli/run.mjs

@@ -1,6 +1,8 @@
 import { execSync } from 'node:child_process';
+import { readFileSync } from 'node:fs';
 import * as p from '@clack/prompts';
 import { defineCommand } from 'citty';
+import { consola } from 'consola';
 import { resolve } from 'pathe';
 import color from 'picocolors';
 import { version } from 'silgi/meta';
@@ -10,11 +12,9 @@ import 'c12';
 import 'compatx';
 import 'klona/full';
 import 'std-env';
-import 'consola';
 import 'consola/utils';
 import 'escape-string-regexp';
 import 'mlly';
-import 'node:fs';
 import 'pkg-types';
 import 'silgi/kit';
 import 'silgi/runtime/meta';
@@ -37,16 +37,21 @@ const run = defineCommand({
     p.intro(color.bold(`Silgi CLI ${color.green(`v${version}`)}`));
     const silgiConfig = await loadOptions({});
     const getCli = resolve(silgiConfig.build.dir, "cli.json");
-    const cli = await import(getCli);
-    const commands = cli.default;
+    const cli = readFileSync(getCli, "utf-8");
+    const cliJson = JSON.parse(cli);
+    if (Object.keys(cliJson).length === 0) {
+      consola.info("Empty command list, maybe forgot pnpm silgi prepare?");
+      return;
+    }
     const commandName = await p.select({
       message: "Select a command to run",
-      options: Object.keys(commands).map((key) => ({
+      options: Object.keys(cliJson).map((key) => ({
         label: key,
         value: key
       }))
     });
-    const scripts = commands[commandName];
+    const scripts = cliJson[commandName];
+    console.log("scripts", scripts);
     const scriptName = await p.select({
       message: "Select a script to run",
       options: Object.keys(scripts).map((key) => ({
@@ -55,7 +60,13 @@ const run = defineCommand({
       }))
     });
     const script = scripts[scriptName];
-    execSync(script, { stdio: "inherit" });
+    if (script.type === "command") {
+      execSync(script.handler, { stdio: "inherit" });
+    }
+    if (script.type === "function") {
+      const fn = eval(`(${script.handler})`);
+      fn();
+    }
   }
 });
 

package/dist/meta/index.d.mts

@@ -1,3 +1,3 @@
-const version = "0.8.0";
+const version = "0.8.2";
 
 export { version };

package/dist/meta/index.d.ts

@@ -1,3 +1,3 @@
-const version = "0.8.0";
+const version = "0.8.2";
 
 export { version };

package/dist/presets/h3/preset.mjs

@@ -8,9 +8,6 @@ const h3 = defineSilgiPreset(
     },
     prerender: {
       crawlLinks: true
-    },
-    commands: {
-      preview: "npx serve ./public"
     }
   },
   {

package/dist/presets/nitro/preset.mjs

@@ -12,9 +12,6 @@ const nitro = defineSilgiPreset(
     typescript: {
       generateTsConfig: false,
       tsconfigPath: ".nitro/types/silgi.tsconfig.json"
-    },
-    commands: {
-      preview: "npx serve ./public"
     }
   },
   {

package/dist/presets/npmpackage/preset.mjs

@@ -9,10 +9,7 @@ const npmPackage = defineSilgiPreset(
     silgi: {
       serverDir: "{{ serverDir }}/silgi"
     },
-    modules: ["./src"],
-    commands: {
-      preview: "npx serve ./public"
-    }
+    modules: ["./src"]
   },
   {
     name: "npm-package",

package/dist/presets/nuxt/preset.mjs

@@ -12,9 +12,6 @@ const nuxt = defineSilgiPreset(
     typescript: {
       generateTsConfig: false,
       tsconfigPath: ".nuxt/silgi.tsconfig.json"
-    },
-    commands: {
-      preview: "npx serve ./public"
     }
   },
   {

package/dist/types/index.d.mts

@@ -351,7 +351,11 @@ 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, string>>) => HookResult;
+    'prepare:commands': (commands: Record<string, Record<string, {
+        type: 'function' | 'command';
+        handler: string;
+        description?: string;
+    }>>) => HookResult;
 }
 
 /**
@@ -726,7 +730,11 @@ interface SilgiCLIOptions extends PresetOptions {
      * ```
      */
     ignoreOptions: Options;
-    commands: Record<string, string>;
+    commands: Record<string, Record<string, {
+        type: 'function' | 'command';
+        handler: string;
+        description?: string;
+    }>>;
 }
 /**
  * Silgi input config (silgi.config)

package/dist/types/index.d.ts

@@ -351,7 +351,11 @@ 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, string>>) => HookResult;
+    'prepare:commands': (commands: Record<string, Record<string, {
+        type: 'function' | 'command';
+        handler: string;
+        description?: string;
+    }>>) => HookResult;
 }
 
 /**
@@ -726,7 +730,11 @@ interface SilgiCLIOptions extends PresetOptions {
      * ```
      */
     ignoreOptions: Options;
-    commands: Record<string, string>;
+    commands: Record<string, Record<string, {
+        type: 'function' | 'command';
+        handler: string;
+        description?: string;
+    }>>;
 }
 /**
  * Silgi input config (silgi.config)

package/package.json

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