silgi 0.19.0 → 0.19.2

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.19.0";
+const version = "0.19.2";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",

package/dist/cli/common.mjs

@@ -1,3 +1,115 @@
+import * as p from '@clack/prompts';
+import { existsSync, promises } from 'node:fs';
+import * as dotenv from 'dotenv';
+import { resolve } from 'pathe';
+
+async function setupDotenv(options) {
+  const targetEnvironment = options.env ?? process.env;
+  const environment = await loadDotenv({
+    cwd: options.cwd,
+    fileName: options.fileName ?? ".env",
+    env: targetEnvironment,
+    interpolate: options.interpolate ?? true
+  });
+  for (const key in environment) {
+    if (!key.startsWith("_") && targetEnvironment[key] === void 0) {
+      targetEnvironment[key] = environment[key];
+    }
+  }
+  return environment;
+}
+async function loadDotenv(options) {
+  const environment = /* @__PURE__ */ Object.create(null);
+  const dotenvFile = resolve(options.cwd, options.fileName);
+  if (existsSync(dotenvFile)) {
+    const parsed = dotenv.parse(await promises.readFile(dotenvFile, "utf8"));
+    Object.assign(environment, parsed);
+  }
+  if (!options.env?._applied) {
+    Object.assign(environment, options.env);
+    environment._applied = true;
+  }
+  if (options.interpolate) {
+    interpolate(environment);
+  }
+  return environment;
+}
+function interpolate(target, source = {}, parse = (v) => v) {
+  function getValue(key) {
+    return source[key] === void 0 ? target[key] : source[key];
+  }
+  function interpolate2(value, parents = []) {
+    if (typeof value !== "string") {
+      return value;
+    }
+    const matches = value.match(/(.?\$\{?[\w:]*\}?)/g) || [];
+    return parse(
+      matches.reduce((newValue, match) => {
+        const parts = /(.?)\$\{?([\w:]+)?\}?/.exec(match) || [];
+        const prefix = parts[1];
+        let value2, replacePart;
+        if (prefix === "\\") {
+          replacePart = parts[0] || "";
+          value2 = replacePart.replace(String.raw`\$`, "$");
+        } else {
+          const key = parts[2];
+          replacePart = (parts[0] || "").slice(prefix.length);
+          if (parents.includes(key)) {
+            console.warn(
+              `Please avoid recursive environment variables ( loop: ${parents.join(
+                " > "
+              )} > ${key} )`
+            );
+            return "";
+          }
+          value2 = getValue(key);
+          value2 = interpolate2(value2, [...parents, key]);
+        }
+        return value2 === void 0 ? newValue : newValue.replace(replacePart, value2);
+      }, value)
+    );
+  }
+  for (const key in target) {
+    target[key] = interpolate2(getValue(key));
+  }
+}
+
+let initialized = false;
+async function prepareEnv(silgiConfig) {
+  if (initialized)
+    return;
+  initialized = true;
+  const customEnvironments = silgiConfig.environments;
+  const environment = silgiConfig.activeEnvironment ? silgiConfig.activeEnvironment : await p.select({
+    message: "Select an environment",
+    options: customEnvironments?.length > 0 ? customEnvironments.map((env) => ({
+      label: env.fileName,
+      value: env.fileName
+    })) : [
+      { label: "Development (.env.dev)", value: "dev" },
+      { label: "Docker (.env.docker)", value: "docker" },
+      { label: "Staging (.env.staging)", value: "staging" },
+      { label: "Testing (.env.testing)", value: "testing" },
+      { label: "Production (.env)", value: ".env" }
+    ]
+  });
+  const findEnv = customEnvironments?.find((env) => env.fileName === environment);
+  if (findEnv) {
+    await setupDotenv({
+      cwd: findEnv.cwd || silgiConfig.rootDir,
+      interpolate: findEnv.interpolate,
+      fileName: findEnv.fileName,
+      env: findEnv.env
+    });
+  } else {
+    await setupDotenv({
+      cwd: silgiConfig.rootDir,
+      interpolate: true,
+      fileName: environment === "prod" ? ".env" : `.env.${environment}`
+    });
+  }
+}
+
 const commonArgs = {
   dir: {
     type: "string",
@@ -10,4 +122,4 @@ const commonArgs = {
   }
 };
 
-export { commonArgs as c };
+export { commonArgs as c, prepareEnv as p };

package/dist/cli/dev.mjs

@@ -17,9 +17,6 @@ import 'silgi/types';
 import 'unimport';
 import '../_chunks/routeRules.mjs';
 import 'ufo';
-import './env.mjs';
-import '@clack/prompts';
-import 'dotenv';
 import 'mlly';
 import 'dev-jiti';
 import 'node:url';
@@ -41,6 +38,8 @@ import 'pkg-types';
 import 'pathe/utils';
 import 'untyped';
 import './types.mjs';
+import '@clack/prompts';
+import 'dotenv';
 
 async function reloadScan(silgi, path, _stats) {
   const startTime = performance.now();

package/dist/cli/install.mjs

@@ -1,22 +1,48 @@
 import { execSync } from 'node:child_process';
 import { readFileSync } from 'node:fs';
-import { defineCommand } from 'citty';
+import { defineCommand, runCommand } from 'citty';
 import { consola } from 'consola';
 import { resolve } from 'pathe';
 import { version } from 'silgi/meta';
 import { c as commonArgs } from './common.mjs';
+import prepare from './prepare.mjs';
 import { l as loadOptions } from './loader.mjs';
+import '@clack/prompts';
+import 'dotenv';
+import 'silgi/kit';
+import './writeTypesAndFiles.mjs';
+import 'node:fs/promises';
+import 'hookable';
+import 'silgi/core';
+import 'silgi/runtime/meta';
+import 'silgi/types';
+import 'unimport';
+import '../_chunks/routeRules.mjs';
+import 'ufo';
+import 'mlly';
+import 'dev-jiti';
+import './compatibility.mjs';
+import 'semver/functions/satisfies.js';
+import 'node:url';
+import 'defu';
+import 'exsolve';
+import 'globby';
+import 'ignore';
+import '@oxc-parser/wasm';
+import 'klona';
+import 'unstorage';
+import 'pathe/utils';
+import 'untyped';
+import './types.mjs';
+import 'pkg-types';
+import './run.mjs';
+import 'picocolors';
 import 'c12';
 import 'compatx';
 import 'klona/full';
 import 'std-env';
 import 'consola/utils';
 import 'escape-string-regexp';
-import 'mlly';
-import 'pkg-types';
-import 'silgi/kit';
-import 'silgi/runtime/meta';
-import 'ufo';
 
 const install = defineCommand({
   meta: {
@@ -32,6 +58,10 @@ const install = defineCommand({
     }
   },
   async run() {
+    await runCommand(prepare, {
+      rawArgs: []
+    }).catch(() => {
+    });
     const silgiConfig = await loadOptions({});
     const commandArgs = process.argv.slice(process.argv.indexOf("install") + 1);
     const extraArgs = commandArgs.length ? ` ${commandArgs.join(" ")}` : "";

package/dist/cli/prepare.mjs

@@ -1,10 +1,11 @@
-import { defineCommand } from 'citty';
+import { defineCommand, runCommand } from 'citty';
 import consola from 'consola';
 import { join, resolve } from 'pathe';
 import { version } from 'silgi/meta';
 import { writeFile } from 'silgi/kit';
 import { c as createSilgiCLI, p as prepare$1, w as writeTypesAndFiles, a as writeCoreFile } from './writeTypesAndFiles.mjs';
 import { c as commonArgs } from './common.mjs';
+import run from './run.mjs';
 import 'node:fs';
 import 'node:fs/promises';
 import 'hookable';
@@ -14,9 +15,6 @@ import 'silgi/types';
 import 'unimport';
 import '../_chunks/routeRules.mjs';
 import 'ufo';
-import './env.mjs';
-import '@clack/prompts';
-import 'dotenv';
 import 'mlly';
 import 'dev-jiti';
 import './compatibility.mjs';
@@ -40,6 +38,10 @@ import 'pkg-types';
 import 'pathe/utils';
 import 'untyped';
 import './types.mjs';
+import '@clack/prompts';
+import 'dotenv';
+import 'node:child_process';
+import 'picocolors';
 
 function serializeRules(rules, options = {}) {
   try {
@@ -169,6 +171,9 @@ const prepare = defineCommand({
     await silgi.callHook("close", silgi);
     consola.withTag("silgi").success("Prepare completed");
     await close();
+    await runCommand(run, {
+      rawArgs: ["--tag", "init"]
+    });
   }
 });
 

package/dist/cli/run.mjs

@@ -7,8 +7,7 @@ import { createJiti } from 'dev-jiti';
 import { resolve } from 'pathe';
 import color from 'picocolors';
 import { version } from 'silgi/meta';
-import { c as commonArgs } from './common.mjs';
-import { p as prepareEnv } from './env.mjs';
+import { c as commonArgs, p as prepareEnv } from './common.mjs';
 import { l as loadOptions } from './loader.mjs';
 import 'dotenv';
 import 'c12';
@@ -46,10 +45,6 @@ const run = defineCommand({
     const getCli = resolve(silgiConfig.build.dir, "cli.json");
     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;
-    }
     await prepareEnv(silgiConfig);
     let selectedCommands = [];
     if (tags) {
@@ -67,7 +62,6 @@ const run = defineCommand({
         }
       }
       if (selectedCommands.length === 0) {
-        consola.warn(`No commands found with tags: ${tags.join(", ")}`);
         return;
       }
     } else {
@@ -102,6 +96,9 @@ const run = defineCommand({
     }
     for (const cmd of selectedCommands) {
       consola.info(`Running ${cmd.command}:${cmd.script}...`);
+      if (!cmd.handler.enabled) {
+        continue;
+      }
       if (cmd.handler.type === "command") {
         execSync(cmd.handler.handler, { stdio: "inherit" });
       }

package/dist/cli/writeTypesAndFiles.mjs

@@ -9,7 +9,7 @@ import { runtimeDir } from 'silgi/runtime/meta';
 import { autoImportTypes } from 'silgi/types';
 import { scanExports, createUnimport, toExports } from 'unimport';
 import { c as createRouteRules } from '../_chunks/routeRules.mjs';
-import { p as prepareEnv } from './env.mjs';
+import { p as prepareEnv } from './common.mjs';
 import { resolveModuleExportNames, resolvePath, parseNodeModulePath, lookupNodeModuleSubpath } from 'mlly';
 import { createJiti } from 'dev-jiti';
 import { a as hasInstalledModule, h as hasError } from './compatibility.mjs';

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.19.0";
+const version = "0.19.2";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",

package/dist/meta/index.d.ts

@@ -1,4 +1,4 @@
-const version = "0.19.0";
+const version = "0.19.2";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",

package/dist/types/index.d.mts

@@ -280,6 +280,7 @@ interface SilgiCLIHooks extends SilgiHooks {
         handler: string;
         description?: string;
         tags?: string[];
+        enabled?: boolean;
     }>>) => HookResult;
     'prepare:installPackages': (packages: Record<'dependencies' | 'devDependencies', Record<string, string>>) => HookResult;
 }

package/dist/types/index.d.ts

@@ -280,6 +280,7 @@ interface SilgiCLIHooks extends SilgiHooks {
         handler: string;
         description?: string;
         tags?: string[];
+        enabled?: boolean;
     }>>) => 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.0",
+  "version": "0.19.2",
   "private": false,
   "sideEffects": false,
   "exports": {

package/dist/cli/env.mjs

@@ -1,113 +0,0 @@
-import * as p from '@clack/prompts';
-import { existsSync, promises } from 'node:fs';
-import * as dotenv from 'dotenv';
-import { resolve } from 'pathe';
-
-async function setupDotenv(options) {
-  const targetEnvironment = options.env ?? process.env;
-  const environment = await loadDotenv({
-    cwd: options.cwd,
-    fileName: options.fileName ?? ".env",
-    env: targetEnvironment,
-    interpolate: options.interpolate ?? true
-  });
-  for (const key in environment) {
-    if (!key.startsWith("_") && targetEnvironment[key] === void 0) {
-      targetEnvironment[key] = environment[key];
-    }
-  }
-  return environment;
-}
-async function loadDotenv(options) {
-  const environment = /* @__PURE__ */ Object.create(null);
-  const dotenvFile = resolve(options.cwd, options.fileName);
-  if (existsSync(dotenvFile)) {
-    const parsed = dotenv.parse(await promises.readFile(dotenvFile, "utf8"));
-    Object.assign(environment, parsed);
-  }
-  if (!options.env?._applied) {
-    Object.assign(environment, options.env);
-    environment._applied = true;
-  }
-  if (options.interpolate) {
-    interpolate(environment);
-  }
-  return environment;
-}
-function interpolate(target, source = {}, parse = (v) => v) {
-  function getValue(key) {
-    return source[key] === void 0 ? target[key] : source[key];
-  }
-  function interpolate2(value, parents = []) {
-    if (typeof value !== "string") {
-      return value;
-    }
-    const matches = value.match(/(.?\$\{?[\w:]*\}?)/g) || [];
-    return parse(
-      matches.reduce((newValue, match) => {
-        const parts = /(.?)\$\{?([\w:]+)?\}?/.exec(match) || [];
-        const prefix = parts[1];
-        let value2, replacePart;
-        if (prefix === "\\") {
-          replacePart = parts[0] || "";
-          value2 = replacePart.replace(String.raw`\$`, "$");
-        } else {
-          const key = parts[2];
-          replacePart = (parts[0] || "").slice(prefix.length);
-          if (parents.includes(key)) {
-            console.warn(
-              `Please avoid recursive environment variables ( loop: ${parents.join(
-                " > "
-              )} > ${key} )`
-            );
-            return "";
-          }
-          value2 = getValue(key);
-          value2 = interpolate2(value2, [...parents, key]);
-        }
-        return value2 === void 0 ? newValue : newValue.replace(replacePart, value2);
-      }, value)
-    );
-  }
-  for (const key in target) {
-    target[key] = interpolate2(getValue(key));
-  }
-}
-
-let initialized = false;
-async function prepareEnv(silgiConfig) {
-  if (initialized)
-    return;
-  initialized = true;
-  const customEnvironments = silgiConfig.environments;
-  const environment = silgiConfig.activeEnvironment ? silgiConfig.activeEnvironment : await p.select({
-    message: "Select an environment",
-    options: customEnvironments?.length > 0 ? customEnvironments.map((env) => ({
-      label: env.fileName,
-      value: env.fileName
-    })) : [
-      { label: "Development (.env.dev)", value: "dev" },
-      { label: "Docker (.env.docker)", value: "docker" },
-      { label: "Staging (.env.staging)", value: "staging" },
-      { label: "Testing (.env.testing)", value: "testing" },
-      { label: "Production (.env)", value: ".env" }
-    ]
-  });
-  const findEnv = customEnvironments?.find((env) => env.fileName === environment);
-  if (findEnv) {
-    await setupDotenv({
-      cwd: findEnv.cwd || silgiConfig.rootDir,
-      interpolate: findEnv.interpolate,
-      fileName: findEnv.fileName,
-      env: findEnv.env
-    });
-  } else {
-    await setupDotenv({
-      cwd: silgiConfig.rootDir,
-      interpolate: true,
-      fileName: environment === "prod" ? ".env" : `.env.${environment}`
-    });
-  }
-}
-
-export { prepareEnv as p };