silgi 0.23.11 → 0.24.1

package/dist/cli/compatibility.mjs

@@ -1,5 +1,5 @@
 import satisfies from 'semver/functions/satisfies.js';
-import { useSilgiCLI } from 'silgi/core';
+import { useSilgiCLI } from 'silgi';
 import { version } from 'silgi/meta';
 
 const SEMANTIC_VERSION_RE = /-\d+\.[0-9a-f]+/;

package/dist/cli/dev.mjs

@@ -3,7 +3,7 @@ import { watch } from 'chokidar';
 import { defineCommand, runCommand } from 'citty';
 import consola from 'consola';
 import { join } from 'pathe';
-import { useSilgiCLI } from 'silgi/core';
+import { useSilgiCLI } from 'silgi';
 import { version } from 'silgi/meta';
 import { s as silgiCLIIClose } from '../_chunks/silgiApp.mjs';
 import { c as commonArgs, p as prepare } from './prepare.mjs';
@@ -31,6 +31,7 @@ import 'globby';
 import 'ignore';
 import '@oxc-parser/wasm';
 import 'klona';
+import 'silgi/runtime';
 import 'unstorage';
 import './types.mjs';
 import 'c12';

package/dist/cli/index.mjs

@@ -1,5 +1,8 @@
 import { defineCommand, runMain } from 'citty';
-import { p as packageJson } from '../_chunks/index.mjs';
+
+const version = "0.24.1";
+const packageJson = {
+	version: version};
 
 const main = defineCommand({
   meta: {

package/dist/cli/init.mjs

@@ -39,7 +39,7 @@ const init = defineCommand({
     ];
     if (framework === "nitro" || framework === "nuxt") {
       const plugin = [
-        `import { buildSilgi } from '../silgi/core'`,
+        `import { buildSilgi } from '../silgi'`,
         "",
         "export default defineNitroPlugin(async (nitro) => {",
         "  const _silgi = buildSilgi(",

package/dist/cli/install.mjs

@@ -10,7 +10,7 @@ import 'knitwork';
 import 'silgi/kit';
 import 'node:fs/promises';
 import 'hookable';
-import 'silgi/core';
+import 'silgi';
 import 'silgi/runtime/meta';
 import 'silgi/types';
 import 'unimport';
@@ -31,6 +31,7 @@ import 'globby';
 import 'ignore';
 import '@oxc-parser/wasm';
 import 'klona';
+import 'silgi/runtime';
 import 'unstorage';
 import 'pathe/utils';
 import 'picocolors';

package/dist/cli/prepare.mjs

@@ -2,12 +2,12 @@ import { defineCommand, runCommand } from 'citty';
 import { join, resolve, relative, dirname, basename, extname, isAbsolute } from 'pathe';
 import { peerDependencies, version } from 'silgi/meta';
 import { genObjectFromRawEntries, genObjectFromRaw, genObjectFromValues } from 'knitwork';
-import { writeFile, relativeWithDot, hash, resolveAlias, directoryToURL, addTemplate, hasError, parseServices, useSilgiRuntimeConfig, normalizeTemplate, useLogger, initRuntimeConfig, resolveSilgiPath, genEnsureSafeVar, isDirectory } from 'silgi/kit';
+import { writeFile, relativeWithDot, hash, resolveAlias, directoryToURL, addTemplate, hasError, parseServices, normalizeTemplate, useLogger, initRuntimeConfig, resolveSilgiPath, genEnsureSafeVar, isDirectory } from 'silgi/kit';
 import { existsSync, promises, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
 import { readdir, readFile } from 'node:fs/promises';
 import consola, { consola as consola$1 } from 'consola';
 import { createHooks, createDebugger } from 'hookable';
-import { useSilgiCLI, replaceRuntimeValues, silgiCLICtx } from 'silgi/core';
+import { useSilgiCLI, replaceRuntimeValues, silgiCLICtx } from 'silgi';
 import { runtimeDir } from 'silgi/runtime/meta';
 import { autoImportTypes } from 'silgi/types';
 import { scanExports, createUnimport, toExports } from 'unimport';
@@ -26,6 +26,7 @@ import { globby } from 'globby';
 import ignore from 'ignore';
 import { parseSync } from '@oxc-parser/wasm';
 import { klona } from 'klona';
+import { useSilgiRuntimeConfig } from 'silgi/runtime';
 import { createStorage, builtinDrivers } from 'unstorage';
 import { l as loadOptions, s as silgiGenerateType } from './types.mjs';
 import { resolveAlias as resolveAlias$1 } from 'pathe/utils';
@@ -863,7 +864,7 @@ function resolveGroupSyntax(group) {
 
 const safeFiles = [
   "silgi/configs",
-  "silgi/core",
+  "silgi",
   "silgi/rules",
   "silgi/scan",
   "silgi/vfs"
@@ -1746,7 +1747,7 @@ async function prepareConfigs(silgi) {
   await silgi.callHook("prepare:configs.ts", _data);
   const importData = [
     "import type { SilgiRuntimeOptions, SilgiRuntimeConfig, SilgiOptions } from 'silgi/types'",
-    "import { useSilgiRuntimeConfig } from 'silgi/runtime/internal/config'",
+    "import { useSilgiRuntimeConfig } from 'silgi'",
     "",
     `export const runtimeConfig: Partial<SilgiRuntimeConfig> = ${genObjectFromRawEntries(
       Object.entries(_data.runtimeConfig).map(([key, value]) => [key, genEnsureSafeVar(value)]),
@@ -2536,7 +2537,7 @@ const run = defineCommand({
           alias: silgiConfig.alias
         });
         let cleanHandler = cmd.handler.handler.replace(/\n/g, "");
-        cleanHandler = `import { silgiCLICtx } from 'silgi/core' 
+        cleanHandler = `import { silgiCLICtx } from 'silgi' 
         ${cleanHandler}
 `;
         await jiti.evalModule(cleanHandler, {

package/dist/cli/types.mjs

@@ -285,7 +285,7 @@ function getSilgiImportsPreset() {
     //   ],
     // },
     {
-      from: "silgi/core",
+      from: "silgi",
       imports: ["useSilgiStorage"]
     }
     // {

package/dist/{core/index.d.ts → index.d.mts}

@@ -1,5 +1,5 @@
 import { SilgiConfig, Silgi, SilgiOperation, MergedSilgiSchema, ServiceType, SilgiSchema, RequiredServiceType, SilgiRuntimeSharedsExtend, SilgiEvents, SilgiRuntimeContext, DefaultNamespaces, BaseSchemaType, SilgiRuntimeShareds, StorageConfig, SilgiCLI, SilgiStorageBase } from 'silgi/types';
-export { s as silgi } from '../shared/silgi.Cs0ZUUXV.js';
+export { s as silgi } from './shared/silgi.Cs0ZUUXV.mjs';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import { Storage, StorageValue } from 'unstorage';
 import * as unctx from 'unctx';

package/dist/{core/index.mjs → index.mjs}

@@ -1,12 +1,12 @@
 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 { a as silgiCLICtx, t as tryUseSilgiCLI, u as useSilgiCLI } from '../_chunks/silgiApp.mjs';
+import { c as createRouteRules } from './_chunks/silgiApp.mjs';
+export { a 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/kit';
+import { useSilgiRuntimeConfig } from 'silgi/runtime';
 import { createStorage as createStorage$1, builtinDrivers, prefixStorage } from 'unstorage';
 import 'ufo';
 

package/dist/kit/index.mjs

@@ -1,4 +1,4 @@
-import { tryUseSilgiCLI, useSilgiCLI, useSilgi } from 'silgi/core';
+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';

package/dist/presets/index.d.mts

@@ -1 +1,2 @@
-export { resolvePreset } from "./_resolve";
+export { resolvePreset } from './_resolve';
+export type { PresetName, PresetNameInput, PresetOptions } from './_types.gen';

package/dist/presets/index.mjs

@@ -1 +1 @@
-export { resolvePreset } from './_resolve.mjs'
+export { resolvePreset } from "./_resolve.mjs";

package/dist/runtime/index.d.mts

@@ -0,0 +1,3 @@
+export { useSilgiRuntimeConfig } from './internal/config';
+export { defineSilgiPlugin } from './internal/plugin';
+export { mergeDeep } from './internal/defu';

package/dist/runtime/index.mjs

@@ -1 +1,3 @@
+export { useSilgiRuntimeConfig } from "./internal/config.mjs";
 export { defineSilgiPlugin } from "./internal/plugin.mjs";
+export { mergeDeep } from "./internal/defu.mjs";

package/dist/runtime/internal/config.mjs

@@ -2,11 +2,11 @@ import defu from "defu";
 import destr from "destr";
 import { klona } from "klona";
 import { snakeCase } from "scule";
-import { tryUseSilgi, useSilgi } from "silgi/core";
-const silgiRuntimeConfig = process.env.RUNTIME_CONFIG;
+import { tryUseSilgi, useSilgi } from "silgi";
+const silgiRuntimeConfig = globalThis.__nitro__?.useRuntimeConfig?.() || process.env.RUNTIME_CONFIG;
 const envOptions = {
   prefix: "NITRO_",
-  altPrefix: silgiRuntimeConfig?.nitro.envPrefix ?? process.env.NITRO_ENV_PREFIX ?? "_",
+  altPrefix: silgiRuntimeConfig?.nitro?.envPrefix ?? process.env.NITRO_ENV_PREFIX ?? "_",
   silgiPrefix: "SILGI_",
   envExpansion: silgiRuntimeConfig?.nitro.envExpansion ?? process.env.NITRO_ENV_EXPANSION ?? false
 };

package/dist/runtime/internal/index.d.mts

@@ -0,0 +1 @@
+export {};

package/dist/runtime/internal/index.mjs

@@ -0,0 +1 @@
+export {};

package/dist/runtime/internal/nitro.mjs

@@ -1,5 +1,5 @@
 import { createError, defineEventHandler, getQuery, H3Error, readBody } from "h3";
-import { ErrorFactory, HttpStatus, parseURI, silgi, SilgiError, useSilgi } from "silgi/core";
+import { ErrorFactory, HttpStatus, parseURI, silgi, SilgiError, useSilgi } from "silgi";
 export default async function addNitroApp(silgiCtx = useSilgi()) {
   const nitro = silgiCtx.framework;
   nitro.router.use("/srn/**", defineEventHandler(async (event) => {

package/lib/config.d.mts

@@ -0,0 +1,7 @@
+import type { SilgiCLIConfig } from 'silgi/types'
+
+export { SilgiCLIConfig } from 'silgi/types'
+
+declare function defineSilgiConfig(config: SilgiCLIConfig): SilgiCLIConfig
+
+export { defineSilgiConfig }

package/lib/config.mjs

@@ -0,0 +1,5 @@
+function defineNitroConfig(config) {
+  return config
+}
+
+export { defineNitroConfig }

package/lib/meta.d.mts

@@ -0,0 +1,4 @@
+export const version: string
+export const dependencies: string
+export const devDependencies: string
+export const peerDependencies: string

package/lib/meta.mjs

@@ -0,0 +1,6 @@
+import packageJson from '../../package.json' with { type: "json" };
+
+export const version = packageJson.version;
+export const dependencies = packageJson.dependencies;
+export const devDependencies = packageJson.devDependencies;
+export const peerDependencies = packageJson.peerDependencies;

package/{runtime-meta.mjs → lib/runtime-meta.mjs}

@@ -1,9 +1,9 @@
 import { fileURLToPath } from 'node:url'
 
-export const pkgDir = fileURLToPath(new URL('.', import.meta.url))
+export const pkgDir = fileURLToPath(new URL('..', import.meta.url))
 
 export const runtimeDir = fileURLToPath(
-  new URL('dist/runtime/', import.meta.url),
+  new URL('../dist/runtime/', import.meta.url),
 )
 
 export const runtimeDependencies = [
@@ -14,7 +14,7 @@ export const runtimeDependencies = [
   'hookable',
   'iron-webcrypto',
   'klona',
-  'node-fetch-native',
+  'node-mock-http',
   'ofetch',
   'ohash',
   'pathe',

package/package.json

@@ -1,79 +1,30 @@
 {
   "name": "silgi",
   "type": "module",
-  "version": "0.23.11",
+  "version": "0.24.1",
   "private": false,
   "sideEffects": false,
   "exports": {
-    "./cli": {
-      "types": "./cli.d.ts",
-      "import": "./dist/cli/index.mjs"
-    },
-    "./cli/config": {
-      "types": "./dist/cli/config/index.d.ts",
-      "import": "./dist/cli/config/index.mjs"
-    },
-    "./config": {
-      "types": "./config.d.ts",
-      "import": "./dist/config/index.mjs"
-    },
-    ".": {
-      "types": "./dist/core/index.d.ts",
-      "import": "./dist/core/index.mjs"
-    },
-    "./meta": {
-      "types": "./dist/meta/index.d.ts",
-      "import": "./dist/meta/index.mjs"
-    },
-    "./types": {
-      "types": "./types.d.ts",
-      "import": "./dist/types/index.mjs"
-    },
-    "./kit": {
-      "types": "./kit.d.ts",
-      "import": "./dist/kit/index.mjs"
-    },
-    "./core": {
-      "types": "./core.d.ts",
-      "import": "./dist/core/index.mjs"
-    },
-    "./presets": {
-      "types": "./presets.d.ts",
-      "import": "./dist/presets/index.mjs"
-    },
-    "./runtime": {
-      "silgiCore": "./dist/runtime/*.ts",
-      "silgiCoreTypes": "./dist/runtime/*.ts",
-      "types": "./runtime.d.ts",
-      "import": "./dist/runtime/index.mjs"
-    },
-    "./runtime/meta": {
-      "types": "./runtime-meta.d.ts",
-      "import": "./runtime-meta.mjs"
-    },
-    "./runtime/*": {
-      "silgiCore": "./dist/runtime/*.ts",
-      "silgiCoreTypes": "./dist/runtime/*.ts",
-      "types": "./dist/runtime/*.d.ts",
-      "import": "./dist/runtime/*.mjs"
-    },
-    "./dist/runtime/*": {
-      "types": "./dist/runtime/*.d.ts",
-      "import": "./dist/runtime/*.mjs"
-    },
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    ".": "./dist/index.mjs",
+    "./cli": "./dist/cli/index.mjs",
+    "./cli/config": "./dist/cli/config/index.mjs",
+    "./kit": "./dist/kit/index.mjs",
+    "./config": "./lib/config.mjs",
+    "./types": "./dist/types/index.d.mts",
+    "./meta": "./lib/meta.mjs",
+    "./presets": "./dist/presets/index.mjs",
+    "./runtime": "./dist/runtime/index.mjs",
+    "./runtime/internal": "./dist/runtime/internal/index.mjs",
+    "./runtime/meta": "./lib/runtime-meta.mjs"
   },
-  "main": "./dist/core/index.mjs",
-  "types": "./dist/core/index.d.ts",
   "bin": {
     "silgi": "./dist/cli/index.mjs"
   },
   "files": [
-    "*.d.ts",
     "bin",
     "dist",
-    "package.json",
-    "runtime-meta.*"
+    "lib"
   ],
   "peerDependencies": {
     "@fastify/deepmerge": "^3.0.0",

package/cli.d.ts

@@ -1 +0,0 @@
-export * from './dist/cli/index';

package/config.d.ts

@@ -1 +0,0 @@
-export * from './dist/config/index';

package/core.d.ts

@@ -1 +0,0 @@
-export * from './dist/core/index';

package/dist/_chunks/index.mjs

@@ -1,72 +0,0 @@
-const version = "0.23.11";
-const peerDependencies = {
-	"@fastify/deepmerge": "^3.0.0",
-	"@nuxt/kit": "^3.15.3",
-	"@nuxt/schema": "^3.15.4",
-	"@silgi/ecosystem": "^0.3.0",
-	h3: "^1.15.1",
-	nitropack: "^2.10.4",
-	nuxt: "^3.15.3",
-	typescript: "^5.7.3",
-	vue: "^3.5.13",
-	zod: "^3.24.1"
-};
-const dependencies = {
-	"@clack/prompts": "catalog:",
-	"@fastify/deepmerge": "catalog:",
-	"@oxc-parser/wasm": "catalog:",
-	"@standard-schema/spec": "catalog:",
-	c12: "catalog:",
-	chokidar: "catalog:",
-	citty: "catalog:",
-	compatx: "catalog:",
-	consola: "catalog:",
-	defu: "catalog:",
-	destr: "catalog:",
-	"dev-jiti": "catalog:",
-	"dot-prop": "catalog:",
-	dotenv: "catalog:",
-	"escape-string-regexp": "catalog:",
-	exsolve: "^1.0.4",
-	globby: "catalog:",
-	hookable: "catalog:",
-	ignore: "catalog:",
-	klona: "catalog:",
-	knitwork: "catalog:",
-	mlly: "catalog:",
-	ofetch: "catalog:",
-	ohash: "catalog:",
-	pathe: "catalog:",
-	picocolors: "catalog:",
-	"pkg-types": "catalog:",
-	scule: "catalog:",
-	semver: "catalog:",
-	"std-env": "catalog:",
-	ufo: "catalog:",
-	unctx: "catalog:",
-	unimport: "catalog:",
-	unstorage: "catalog:",
-	untyped: "catalog:"
-};
-const devDependencies = {
-	"@antfu/eslint-config": "catalog:",
-	"@nuxt/kit": "catalog:",
-	"@nuxt/schema": "catalog:",
-	"@silgi/ecosystem": "catalog:",
-	"@types/node": "catalog:",
-	"@types/semver": "catalog:",
-	"@vitest/coverage-v8": "catalog:",
-	eslint: "catalog:",
-	h3: "catalog:",
-	nitropack: "catalog:",
-	nuxt: "catalog:",
-	typescript: "catalog:",
-	unbuild: "catalog:",
-	vitest: "catalog:",
-	vue: "catalog:",
-	zod: "catalog:"
-};
-const packageJson = {
-	version: version};
-
-export { devDependencies as a, peerDependencies as b, dependencies as d, packageJson as p, version as v };

package/dist/cli/config/index.d.ts

@@ -1,11 +0,0 @@
-import { SilgiCLIConfig, LoadConfigOptions, SilgiCLIOptions, SilgiCLI } from 'silgi/types';
-import { TSConfig } from 'pkg-types';
-
-declare function loadOptions(configOverrides?: SilgiCLIConfig, opts?: LoadConfigOptions): Promise<SilgiCLIOptions>;
-
-declare function silgiGenerateType(silgi: SilgiCLI): Promise<{
-    declarations: string[];
-    tsConfig: TSConfig;
-}>;
-
-export { loadOptions, silgiGenerateType };

package/dist/cli/index.d.ts

@@ -1,2 +0,0 @@
-
-export { };

package/dist/config/index.d.mts

@@ -1,5 +0,0 @@
-import { SilgiCLIConfig } from 'silgi/types';
-
-declare function defineSilgiConfig(config: SilgiCLIConfig): SilgiCLIConfig;
-
-export { defineSilgiConfig };

package/dist/config/index.d.ts

@@ -1,5 +0,0 @@
-import { SilgiCLIConfig } from 'silgi/types';
-
-declare function defineSilgiConfig(config: SilgiCLIConfig): SilgiCLIConfig;
-
-export { defineSilgiConfig };

package/dist/config/index.mjs

@@ -1,5 +0,0 @@
-function defineSilgiConfig(config) {
-  return config;
-}
-
-export { defineSilgiConfig };