silgi 0.24.18 → 0.24.20

package/dist/core/index.d.mts

@@ -1,39 +1,7 @@
-import * as unctx from 'unctx';
-import { Silgi, SilgiCLI, SilgiConfig, SilgiEvents, SilgiFunction, SilgiOperation, MergedSilgiSchema, ServiceType, SilgiSchema, RequiredServiceType, SilgiRuntimeSharedsExtend, SilgiRuntimeContext, DefaultNamespaces, BaseSchemaType, SilgiRuntimeShareds, StorageConfig, SilgiStorageBase } from 'silgi/types';
+import { SilgiConfig, Silgi, SilgiEvents, SilgiFunction, SilgiOperation, MergedSilgiSchema, ServiceType, SilgiSchema, RequiredServiceType, SilgiRuntimeSharedsExtend, SilgiRuntimeContext, DefaultNamespaces, BaseSchemaType, SilgiRuntimeShareds, StorageConfig, SilgiCLI, SilgiStorageBase } from 'silgi/types';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import { Storage, StorageValue } from 'unstorage';
-
-declare const silgiCtx: unctx.UseContext<Silgi>;
-declare function useSilgi(): Silgi;
-/**
- * Get access to Nuxt instance.
- *
- * Returns null if Nuxt instance is unavailable.
- * @example
- * ```js
- * const silgi = tryUseSilgi()
- * if (silgi) {
- *  // Do something
- * }
- * ```
- */
-declare function tryUseSilgi(): Silgi | null;
-
-declare const silgiCLICtx: unctx.UseContext<SilgiCLI>;
-declare function useSilgiCLI(): SilgiCLI;
-/**
- * Get access to Nuxt instance.
- *
- * Returns null if Nuxt instance is unavailable.
- * @example
- * ```js
- * const silgi = tryUseSilgi()
- * if (silgi) {
- *  // Do something
- * }
- * ```
- */
-declare function tryUseSilgiCLI(): SilgiCLI | null;
+import * as unctx from 'unctx';
 
 declare function createSilgi(config: SilgiConfig): Promise<Silgi>;
 
@@ -263,6 +231,38 @@ declare class SilgiError extends Error implements BaseError {
 }
 declare function isBaseError(error: unknown): error is BaseError;
 
+declare const silgiCtx: unctx.UseContext<Silgi>;
+declare function useSilgi(): Silgi;
+/**
+ * Get access to Nuxt instance.
+ *
+ * Returns null if Nuxt instance is unavailable.
+ * @example
+ * ```js
+ * const silgi = tryUseSilgi()
+ * if (silgi) {
+ *  // Do something
+ * }
+ * ```
+ */
+declare function tryUseSilgi(): Silgi | null;
+
+declare const silgiCLICtx: unctx.UseContext<SilgiCLI>;
+declare function useSilgiCLI(): SilgiCLI;
+/**
+ * Get access to Nuxt instance.
+ *
+ * Returns null if Nuxt instance is unavailable.
+ * @example
+ * ```js
+ * const silgi = tryUseSilgi()
+ * if (silgi) {
+ *  // Do something
+ * }
+ * ```
+ */
+declare function tryUseSilgiCLI(): SilgiCLI | null;
+
 declare function storageMount<T extends Storage = Storage>(silgi?: Silgi): (base: keyof SilgiStorageBase, driver: Parameters<Storage['mount']>[1]) => T;
 
 declare const autoImportTypes: string[];

package/dist/core/index.mjs

@@ -1,9 +1,9 @@
-import { getContext } from 'unctx';
-import { c as createRouteRules } from '../_chunks/routeRules.mjs';
-export { s as silgiCLICtx, t as tryUseSilgiCLI, u as useSilgiCLI } from '../_chunks/routeRules.mjs';
 import { createConsola } from 'consola';
 import defu, { defu as defu$1 } from 'defu';
 import { createHooks } from 'hookable';
+import { c as createRouteRules } from '../_chunks/silgiApp.mjs';
+export { s as silgiCLICtx, t as tryUseSilgiCLI, u as useSilgiCLI } from '../_chunks/silgiApp.mjs';
+import { getContext } from 'unctx';
 import { Buffer } from 'node:buffer';
 import { klona } from 'klona';
 import { useSilgiRuntimeConfig } from 'silgi/runtime';

package/dist/index.d.mts

@@ -1,20 +1,5 @@
 export { BaseError, ErrorCategory, ErrorFactory, ErrorMetadata, ErrorSeverity, HttpStatus, SilgiError, autoImportTypes, createSchema, createService, createShared, createSilgi, createStorage, getEvent, getEventContext, isBaseError, mergeSchemas, mergeServices, mergeShared, parseURI, replaceRuntimeValues, silgi, silgiCLICtx, silgiCtx, storageMount, tryUseSilgi, tryUseSilgiCLI, useSilgi, useSilgiCLI, useSilgiStorage } from './core/index.mjs';
-import { SilgiCLI, SilgiCLIConfig, LoadConfigOptions } from 'silgi/types';
-import 'unctx';
+import 'silgi/types';
 import '@standard-schema/spec';
 import 'unstorage';
-
-/**
- * Prepares route rules for the build
- */
-declare function prepareBuild(silgi: SilgiCLI): Promise<void>;
-
-declare function prepare(_silgi: SilgiCLI): Promise<void>;
-
-declare function createSilgiCLI(config?: SilgiCLIConfig, opts?: LoadConfigOptions): Promise<SilgiCLI>;
-
-declare function writeCoreFile(silgi: SilgiCLI): Promise<void>;
-
-declare function writeTypesAndFiles(silgi: SilgiCLI): Promise<void>;
-
-export { createSilgiCLI, prepare, prepareBuild, writeCoreFile, writeTypesAndFiles };
+import 'unctx';

package/dist/index.mjs

@@ -1,42 +1,11 @@
 export { ErrorCategory, ErrorFactory, ErrorSeverity, HttpStatus, SilgiError, autoImportTypes, createSchema, createService, createShared, createSilgi, createStorage, getEvent, getEventContext, isBaseError, mergeSchemas, mergeServices, mergeShared, parseURI, replaceRuntimeValues, silgi, silgiCtx, storageMount, tryUseSilgi, useSilgi, useSilgiStorage } from './core/index.mjs';
-export { c as createSilgiCLI, a as prepare, p as prepareBuild, w as writeCoreFile, b as writeTypesAndFiles } from './cli/writeTypesAndFiles.mjs';
-export { s as silgiCLICtx, t as tryUseSilgiCLI, u as useSilgiCLI } from './_chunks/routeRules.mjs';
-import 'unctx';
+export { s as silgiCLICtx, t as tryUseSilgiCLI, u as useSilgiCLI } from './_chunks/silgiApp.mjs';
 import 'consola';
 import 'defu';
 import 'hookable';
+import 'unctx';
 import 'node:buffer';
 import 'klona';
 import 'silgi/runtime';
 import 'unstorage';
-import 'knitwork';
-import 'pathe';
-import 'silgi/kit';
-import 'node:fs';
-import 'node:fs/promises';
-import 'silgi';
-import 'silgi/runtime/meta';
-import 'unimport';
-import '@clack/prompts';
-import 'dotenv';
-import 'mlly';
-import 'dev-jiti';
-import './cli/compatibility.mjs';
-import 'semver/functions/satisfies.js';
-import 'silgi/meta';
-import 'node:url';
-import 'exsolve';
 import 'ufo';
-import 'untyped';
-import 'globby';
-import 'ignore';
-import '@oxc-parser/wasm';
-import './cli/types.mjs';
-import 'c12';
-import 'compatx';
-import 'klona/full';
-import 'std-env';
-import 'consola/utils';
-import 'escape-string-regexp';
-import 'pkg-types';
-import 'pathe/utils';

package/dist/kit/index.d.mts

@@ -1,17 +1,34 @@
-import { ConsolaOptions, ConsolaInstance } from 'consola';
 import { SilgiCLI, ModuleOptionsCustom, ModuleDefinition, SilgiModule, ServiceParseModule, SilgiPreset, SilgiPresetMeta, SilgiTemplate, ResolvedSilgiTemplate, SilgiEvents } from 'silgi/types';
 import { Buffer } from 'node:buffer';
+import * as consola from 'consola';
+import { ConsolaOptions } from 'consola';
 import { IncomingMessage, ServerResponse } from 'node:http';
 
-declare function useLogger(tag?: string, options?: Partial<ConsolaOptions>): ConsolaInstance;
-
 declare function hasError(type: SilgiCLI['errors'][0]['type'], silgi?: SilgiCLI): boolean;
 
+declare function directoryToURL(dir: string): URL;
+/**
+ * Resolve a module from a given root path using an algorithm patterned on
+ * the upcoming `import.meta.resolve`. It returns a file URL
+ *
+ * @internal
+ */
+declare function tryResolveModule(id: string, url?: string | string[]): Promise<string | undefined>;
+
 declare function writeFile(file: string, contents: Buffer | string, log?: boolean): Promise<void>;
 declare function isDirectory(path: string): Promise<boolean>;
 
+declare function genEnsureSafeVar(name: string | any): string;
+declare function getAllEntries(obj: object): [string, any][];
+
 declare function hash(data: any): string;
 
+declare function isNuxt(): boolean;
+declare function isNitro(): boolean;
+declare function isH3(): boolean;
+
+declare function useLogger(tag?: string, options?: Partial<ConsolaOptions>): consola.ConsolaInstance;
+
 /**
  * Define a Silgi module, automatically merging defaults with user provided options, installing
  * any hooks that are provided, and calling an optional setup function for full control.
@@ -110,22 +127,6 @@ declare function getIpAddress(event: SilgiEvents): string | false;
  */
 declare function ipAddress(req: IncomingMessage): string;
 
-declare function directoryToURL(dir: string): URL;
-/**
- * Resolve a module from a given root path using an algorithm patterned on
- * the upcoming `import.meta.resolve`. It returns a file URL
- *
- * @internal
- */
-declare function tryResolveModule(id: string, url?: string | string[]): Promise<string | undefined>;
-
-declare function genEnsureSafeVar(name: string | any): string;
-declare function getAllEntries(obj: object): [string, any][];
-
-declare function isNuxt(): boolean;
-declare function isNitro(): boolean;
-declare function isH3(): boolean;
-
 declare function relativeWithDot(from: string, to: string): string;
 /** @since 3.9.0 */
 declare function toArray<T>(value: T | T[]): T[];

package/dist/kit/index.mjs

@@ -1,27 +1,23 @@
-import consola$1, { consola } from 'consola';
 import { tryUseSilgiCLI, useSilgiCLI, useSilgi } from 'silgi';
+import { pathToFileURL, fileURLToPath } from 'node:url';
+import { resolvePath as resolvePath$1 } from 'mlly';
 import fsp from 'node:fs/promises';
+import consola, { consola as consola$1 } from 'consola';
 import { relative, resolve, dirname, normalize, isAbsolute, join, parse, basename } from 'pathe';
 import { colors } from 'consola/utils';
 import { getProperty } from 'dot-prop';
+import { genString, genObjectFromRaw, genObjectFromValues, genObjectFromRawEntries } from 'knitwork';
 import { hash as hash$1 } from 'ohash';
 import { camelCase } from 'scule';
 import { defu } from 'defu';
 import { c as checkSilgiCompatibility } from '../cli/compatibility.mjs';
 import { withLeadingSlash } from 'ufo';
 import { existsSync, promises } from 'node:fs';
-import { fileURLToPath, pathToFileURL } from 'node:url';
-import { resolvePath as resolvePath$1 } from 'mlly';
 import { resolveAlias as resolveAlias$1 } from 'pathe/utils';
 import { hash as hash$2 } from 'silgi/kit';
-import { genString, genObjectFromRaw, genObjectFromValues, genObjectFromRawEntries } from 'knitwork';
 import 'semver/functions/satisfies.js';
 import 'silgi/meta';
 
-function useLogger(tag, options = {}) {
-  return tag ? consola.create(options).withTag(tag) : consola;
-}
-
 function hasError(type, silgi) {
   silgi = silgi ?? tryUseSilgiCLI() ?? void 0;
   if (silgi && silgi.errors.some((error) => error.type === type)) {
@@ -30,6 +26,16 @@ function hasError(type, silgi) {
   return false;
 }
 
+function directoryToURL(dir) {
+  return pathToFileURL(`${dir}/`);
+}
+async function tryResolveModule(id, url = import.meta.url) {
+  try {
+    return await resolvePath$1(id, { url });
+  } catch {
+  }
+}
+
 function prettyPath(p, highlight = true) {
   p = relative(process.cwd(), p);
   return highlight ? colors.cyan(p) : p;
@@ -50,7 +56,7 @@ function _compilePathTemplate(contents) {
   return (params) => contents.replace(/\{\{ ?([\w.]+) ?\}\}/g, (_, match) => {
     const val = getProperty(params, match);
     if (!val) {
-      consola$1.warn(
+      consola.warn(
         `cannot resolve template param '${match}' in ${contents.slice(0, 20)}`
       );
     }
@@ -70,7 +76,7 @@ async function writeFile(file, contents, log = false) {
     typeof contents === "string" ? "utf8" : void 0
   );
   if (log) {
-    consola.info("Generated", prettyPath(file));
+    consola$1.info("Generated", prettyPath(file));
   }
 }
 async function isDirectory$1(path) {
@@ -81,10 +87,78 @@ async function isDirectory$1(path) {
   }
 }
 
+const reservedCode = /* @__PURE__ */ new Set([
+  "process",
+  "global",
+  "runtime",
+  "runtimeConfig"
+]);
+function genEnsureSafeVar(name) {
+  if (typeof name !== "string") {
+    return genString(name);
+  }
+  for (const reserved of reservedCode) {
+    if (name === reserved || name.startsWith(`${reserved}.`)) {
+      return name;
+    }
+  }
+  return genString(name);
+}
+function getAllEntries(obj) {
+  return Object.entries(obj).map(([
+    key,
+    value
+  ]) => {
+    if (typeof value === "function") {
+      return [key, genObjectFromRaw(value)];
+    }
+    if (typeof value === "string") {
+      return [key, genEnsureSafeVar(value)];
+    }
+    if (typeof value === "object" && value !== null) {
+      if (Array.isArray(value)) {
+        return [key, genObjectFromValues(value.map(
+          (item) => typeof item === "object" && item !== null ? genObjectFromRawEntries(getAllEntries(item)) : item
+        ))];
+      } else {
+        return [key, genObjectFromRawEntries(getAllEntries(value))];
+      }
+    }
+    return [key, value];
+  });
+}
+
 function hash(data) {
   return camelCase(hash$1(data));
 }
 
+function isNuxt() {
+  const silgi = useSilgi();
+  if (silgi.options.present === "nitro" || silgi.options.present === "h3" || silgi.options.present === "nuxt") {
+    return true;
+  }
+  return false;
+}
+function isNitro() {
+  const silgi = useSilgi();
+  if (silgi.options.present === "nitro" || silgi.options.present === "h3") {
+    return true;
+  }
+  return false;
+}
+function isH3() {
+  const silgi = useSilgi();
+  if (silgi.options.present === "h3") {
+    return true;
+  }
+  return false;
+}
+
+const logger = consola$1;
+function useLogger(tag, options = {}) {
+  return tag ? logger.create(options).withTag(tag) : logger;
+}
+
 function defineSilgiModule(definition) {
   if (definition) {
     return _defineSilgiModule(definition);
@@ -452,77 +526,4 @@ function isValidIp(ip) {
   return false;
 }
 
-function directoryToURL(dir) {
-  return pathToFileURL(`${dir}/`);
-}
-async function tryResolveModule(id, url = import.meta.url) {
-  try {
-    return await resolvePath$1(id, { url });
-  } catch {
-  }
-}
-
-const reservedCode = /* @__PURE__ */ new Set([
-  "process",
-  "global",
-  "runtime",
-  "runtimeConfig"
-]);
-function genEnsureSafeVar(name) {
-  if (typeof name !== "string") {
-    return genString(name);
-  }
-  for (const reserved of reservedCode) {
-    if (name === reserved || name.startsWith(`${reserved}.`)) {
-      return name;
-    }
-  }
-  return genString(name);
-}
-function getAllEntries(obj) {
-  return Object.entries(obj).map(([
-    key,
-    value
-  ]) => {
-    if (typeof value === "function") {
-      return [key, genObjectFromRaw(value)];
-    }
-    if (typeof value === "string") {
-      return [key, genEnsureSafeVar(value)];
-    }
-    if (typeof value === "object" && value !== null) {
-      if (Array.isArray(value)) {
-        return [key, genObjectFromValues(value.map(
-          (item) => typeof item === "object" && item !== null ? genObjectFromRawEntries(getAllEntries(item)) : item
-        ))];
-      } else {
-        return [key, genObjectFromRawEntries(getAllEntries(value))];
-      }
-    }
-    return [key, value];
-  });
-}
-
-function isNuxt() {
-  const silgi = useSilgi();
-  if (silgi.options.present === "nitro" || silgi.options.present === "h3" || silgi.options.present === "nuxt") {
-    return true;
-  }
-  return false;
-}
-function isNitro() {
-  const silgi = useSilgi();
-  if (silgi.options.present === "nitro" || silgi.options.present === "h3") {
-    return true;
-  }
-  return false;
-}
-function isH3() {
-  const silgi = useSilgi();
-  if (silgi.options.present === "h3") {
-    return true;
-  }
-  return false;
-}
-
 export { MODE_RE, addTemplate, baseHeaderBannerComment, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, genEnsureSafeVar, getAllEntries, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, ipAddress, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };

package/dist/types/index.d.mts

@@ -578,7 +578,7 @@ interface SilgiCLIOptions extends PresetOptions {
     commandType: CommandType;
     routeRules: SilgiRouteRules$1;
     environments: DotenvOptions$1[];
-    activeEnvironment: 'dev' | 'docker' | 'staging' | 'testing' | '.env' | (string & {});
+    activeEnvironment: string;
     envOptions: EnvOptions$1;
     runtimeConfig: SilgiRuntimeConfig$1 & {
         [key: string]: any;

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "silgi",
   "type": "module",
-  "version": "0.24.18",
+  "version": "0.24.20",
   "private": false,
   "sideEffects": false,
   "exports": {
     "./package.json": "./package.json",
-    ".": "./dist/index.mjs",
+    ".": "./dist/core/index.mjs",
+    "./core": "./dist/core/index.mjs",
     "./cli": "./dist/cli/index.mjs",
     "./cli/config": "./dist/cli/config/index.mjs",
     "./kit": "./dist/kit/index.mjs",