silgi 0.5.0 → 0.7.0

package/dist/core/index.d.mts

@@ -1,8 +1,9 @@
-import { SilgiCLIConfig, LoadConfigOptions, SilgiCLIOptions, SilgiCLI, SilgiConfig, Silgi, SilgiRouterTypes, SilgiOperation, MergedSilgiSchema, ServiceType, SilgiSchema, RequiredServiceType, SilgiModuleShared, SilgiEvent, DefaultNamespaces, BaseSchemaType } from 'silgi/types';
+import { SilgiCLIConfig, LoadConfigOptions, SilgiCLIOptions, SilgiCLI, SilgiConfig, Silgi, SilgiRouterTypes, SilgiOperation, MergedSilgiSchema, ServiceType, SilgiSchema, RequiredServiceType, ModuleRuntimeShared, SilgiEvent, DefaultNamespaces, BaseSchemaType } from 'silgi/types';
 import { TSConfig } from 'pkg-types';
 import { FetchOptions } from 'ofetch';
-export { c as createStorage, s as silgi } from '../shared/silgi.DGmIWx95.mjs';
+export { c as createStorage, s as silgi, u as useSilgiStorage } from '../shared/silgi.BFbL2aof.mjs';
 import { StandardSchemaV1 } from '@standard-schema/spec';
+import * as unctx from 'unctx';
 import 'unstorage';
 
 declare function loadOptions(configOverrides?: SilgiCLIConfig, opts?: LoadConfigOptions): Promise<SilgiCLIOptions>;
@@ -84,7 +85,7 @@ declare function parseURI(uri: string, uris: Record<string, URITemplate>): Silgi
 type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never;
 declare function mergeSchemas<T extends MergedSilgiSchema[]>(typesOrArray: [...T] | T): UnionToIntersection<T[number]>;
 declare function mergeServices<T extends ServiceType<SilgiSchema>[]>(servicesOrArray: [...T] | T): RequiredServiceType<SilgiSchema>;
-declare function mergeShared<T extends SilgiModuleShared[]>(sharedOrArray: [...T] | T): UnionToIntersection<T[number]>;
+declare function mergeShared<T extends ModuleRuntimeShared[]>(sharedOrArray: [...T] | T): UnionToIntersection<T[number]>;
 
 declare function getEvent<T>(event?: SilgiEvent): T;
 
@@ -96,7 +97,7 @@ declare function createSchema<T extends Partial<Record<keyof DefaultNamespaces,
 
 declare function createService<T extends SilgiSchema>(variables: ServiceType<T>): ServiceType<T>;
 
-declare function createShared(shared: Partial<SilgiModuleShared>): SilgiModuleShared;
+declare function createShared(shared: Partial<ModuleRuntimeShared>): ModuleRuntimeShared;
 
 declare enum HttpStatus {
     /** [100] Server has received the request headers and client should proceed to send the request body */
@@ -286,6 +287,36 @@ 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;
 
-export { type BaseError, ErrorCategory, ErrorFactory, type ErrorMetadata, ErrorSeverity, HttpStatus, SchemaParser, SilgiError, createSchema, createService, createShared, createSilgi, createSilgiFetch, getEvent, isBaseError, loadOptions, mergeSchemas, mergeServices, mergeShared, parseURI, silgiGenerateType, useSilgi };
+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;
+
+export { type BaseError, ErrorCategory, ErrorFactory, type ErrorMetadata, ErrorSeverity, HttpStatus, SchemaParser, SilgiError, createSchema, createService, createShared, createSilgi, createSilgiFetch, getEvent, isBaseError, loadOptions, mergeSchemas, mergeServices, mergeShared, parseURI, silgiCLICtx, silgiCtx, silgiGenerateType, tryUseSilgi, tryUseSilgiCLI, useSilgi, useSilgiCLI };

package/dist/core/index.d.ts

@@ -1,8 +1,9 @@
-import { SilgiCLIConfig, LoadConfigOptions, SilgiCLIOptions, SilgiCLI, SilgiConfig, Silgi, SilgiRouterTypes, SilgiOperation, MergedSilgiSchema, ServiceType, SilgiSchema, RequiredServiceType, SilgiModuleShared, SilgiEvent, DefaultNamespaces, BaseSchemaType } from 'silgi/types';
+import { SilgiCLIConfig, LoadConfigOptions, SilgiCLIOptions, SilgiCLI, SilgiConfig, Silgi, SilgiRouterTypes, SilgiOperation, MergedSilgiSchema, ServiceType, SilgiSchema, RequiredServiceType, ModuleRuntimeShared, SilgiEvent, DefaultNamespaces, BaseSchemaType } from 'silgi/types';
 import { TSConfig } from 'pkg-types';
 import { FetchOptions } from 'ofetch';
-export { c as createStorage, s as silgi } from '../shared/silgi.DGmIWx95.js';
+export { c as createStorage, s as silgi, u as useSilgiStorage } from '../shared/silgi.BFbL2aof.js';
 import { StandardSchemaV1 } from '@standard-schema/spec';
+import * as unctx from 'unctx';
 import 'unstorage';
 
 declare function loadOptions(configOverrides?: SilgiCLIConfig, opts?: LoadConfigOptions): Promise<SilgiCLIOptions>;
@@ -84,7 +85,7 @@ declare function parseURI(uri: string, uris: Record<string, URITemplate>): Silgi
 type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never;
 declare function mergeSchemas<T extends MergedSilgiSchema[]>(typesOrArray: [...T] | T): UnionToIntersection<T[number]>;
 declare function mergeServices<T extends ServiceType<SilgiSchema>[]>(servicesOrArray: [...T] | T): RequiredServiceType<SilgiSchema>;
-declare function mergeShared<T extends SilgiModuleShared[]>(sharedOrArray: [...T] | T): UnionToIntersection<T[number]>;
+declare function mergeShared<T extends ModuleRuntimeShared[]>(sharedOrArray: [...T] | T): UnionToIntersection<T[number]>;
 
 declare function getEvent<T>(event?: SilgiEvent): T;
 
@@ -96,7 +97,7 @@ declare function createSchema<T extends Partial<Record<keyof DefaultNamespaces,
 
 declare function createService<T extends SilgiSchema>(variables: ServiceType<T>): ServiceType<T>;
 
-declare function createShared(shared: Partial<SilgiModuleShared>): SilgiModuleShared;
+declare function createShared(shared: Partial<ModuleRuntimeShared>): ModuleRuntimeShared;
 
 declare enum HttpStatus {
     /** [100] Server has received the request headers and client should proceed to send the request body */
@@ -286,6 +287,36 @@ 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;
 
-export { type BaseError, ErrorCategory, ErrorFactory, type ErrorMetadata, ErrorSeverity, HttpStatus, SchemaParser, SilgiError, createSchema, createService, createShared, createSilgi, createSilgiFetch, getEvent, isBaseError, loadOptions, mergeSchemas, mergeServices, mergeShared, parseURI, silgiGenerateType, useSilgi };
+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;
+
+export { type BaseError, ErrorCategory, ErrorFactory, type ErrorMetadata, ErrorSeverity, HttpStatus, SchemaParser, SilgiError, createSchema, createService, createShared, createSilgi, createSilgiFetch, getEvent, isBaseError, loadOptions, mergeSchemas, mergeServices, mergeShared, parseURI, silgiCLICtx, silgiCtx, silgiGenerateType, tryUseSilgi, tryUseSilgiCLI, useSilgi, useSilgiCLI };

package/dist/core/index.mjs

@@ -36,7 +36,8 @@ const SilgiCLIDefaults = {
   scanDirs: [],
   build: {
     dir: ".silgi",
-    typesDir: "{{ build.dir }}/types"
+    typesDir: "{{ build.dir }}/types",
+    templates: []
   },
   output: {
     dir: "{{ rootDir }}/.output",
@@ -50,9 +51,8 @@ const SilgiCLIDefaults = {
     clientDir: "{{ clientDir }}/silgi",
     publicDir: "{{ silgi.serverDir }}/public",
     utilsDir: "{{ silgi.serverDir }}/utils",
-    composablesDir: "{{ silgi.serverDir }}/composables",
-    typesDir: "{{ silgi.serverDir }}/types",
-    servicesDir: "{{ silgi.serverDir }}/services"
+    vfsDir: "{{ silgi.serverDir }}/vfs",
+    typesDir: "{{ silgi.serverDir }}/types"
   },
   // Modules
   _modules: [],
@@ -62,6 +62,7 @@ const SilgiCLIDefaults = {
   future: {},
   storage: {},
   devStorage: {},
+  stub: false,
   // bundledStorage: [],
   // publicAssets: [],
   // serverAssets: [],
@@ -72,7 +73,7 @@ const SilgiCLIDefaults = {
     exclude: [],
     dirs: [],
     presets: [],
-    virtualImports: ["#imports"]
+    virtualImports: ["#silgiImports"]
   },
   // virtual: {},
   // compressPublicAssets: false,
@@ -113,7 +114,7 @@ const SilgiCLIDefaults = {
     version: ""
   },
   extensions: [".js", ".jsx", ".mjs", ".ts", ".tsx", ".vue"],
-  ignoreOptions: undefined
+  ignoreOptions: void 0
 };
 
 const fallbackCompatibilityDate = "2025-02-04";
@@ -206,14 +207,16 @@ async function resolveImportsOptions(options) {
   }
   options.imports.presets ??= [];
   options.imports.presets.push(...getSilgiImportsPreset());
-  const h3Exports = await resolveModuleExportNames("h3", {
-    url: import.meta.url
-  });
-  options.imports.presets ??= [];
-  options.imports.presets.push({
-    from: "h3",
-    imports: h3Exports.filter((n) => !/^[A-Z]/.test(n) && n !== "use")
-  });
+  if (options.preset === "h3") {
+    const h3Exports = await resolveModuleExportNames("h3", {
+      url: import.meta.url
+    });
+    options.imports.presets ??= [];
+    options.imports.presets.push({
+      from: "h3",
+      imports: h3Exports.filter((n) => !/^[A-Z]/.test(n) && n !== "use")
+    });
+  }
   options.imports.dirs ??= [];
   options.imports.dirs.push(
     ...options.scanDirs.map((dir) => join(dir, "utils/**/*"))
@@ -232,10 +235,15 @@ async function resolveImportsOptions(options) {
 function getSilgiImportsPreset() {
   return [
     // TODO: buraya bizim importlarimiz gelecek.
-    // {
-    //   from: 'nitropack/runtime',
-    //   imports: ['useNitroApp'],
-    // },
+    {
+      from: "silgi",
+      imports: [
+        "createShared",
+        "useSilgi",
+        "createService",
+        "createSchema"
+      ]
+    },
     // {
     //   from: 'nitropack/runtime',
     //   imports: ['useRuntimeConfig', 'useAppConfig'],
@@ -253,10 +261,10 @@ function getSilgiImportsPreset() {
     //     'cachedEventHandler',
     //   ],
     // },
-    // {
-    //   from: 'nitropack/runtime/internal/storage',
-    //   imports: ['useStorage'],
-    // },
+    {
+      from: "silgi/core",
+      imports: ["useSilgiStorage"]
+    }
     // {
     //   from: 'nitropack/runtime/internal/renderer',
     //   imports: ['defineRenderHandler'],
@@ -302,21 +310,14 @@ async function resolvePathOptions(options) {
   if (options.preset === "npm-package") {
     const packageJsonPath = resolve(options.rootDir, "package.json");
     const packageJson = await readPackageJSON(packageJsonPath);
-    if (packageJson.name === undefined) {
+    if (packageJson.name === void 0) {
       throw new Error("Package name is undefined");
     }
     options.alias ||= {};
     options.alias[packageJson.name] = join(options.rootDir, "src/module.ts");
     options.alias[`${packageJson.name}/runtime/`] = join(options.rootDir, "src/runtime/");
-    options.alias = {
-      ...options.alias,
-      "silgi/runtime": join(runtimeDir),
-      "#internal/silgi": join(runtimeDir),
-      "silgi/runtime/*": join(runtimeDir, "*"),
-      "#internal/silgi/*": join(runtimeDir, "*")
-    };
   }
-  if (options.typescript?.internalPaths) {
+  if (options.typescript?.internalPaths || options.stub) {
     options.alias = {
       ...options.alias,
       "silgi/runtime": join(runtimeDir),
@@ -338,6 +339,12 @@ async function resolvePathOptions(options) {
     "~~/": join(options.rootDir, "/"),
     "@@/": join(options.rootDir, "/")
   };
+  if (options.preset === "npm-package") {
+    options.alias = {
+      ...options.alias,
+      "#silgi/app/": join(options.build.dir, "/")
+    };
+  }
   if (options.alias && typeof options.alias === "object") {
     ((options.typescript.tsConfig ??= {}).compilerOptions ??= {}).paths ??= {};
     const paths = options.typescript.tsConfig.compilerOptions.paths;
@@ -402,8 +409,8 @@ async function resolvePathOptions(options) {
     options,
     options.rootDir
   );
-  options.silgi.composablesDir = resolveSilgiPath(
-    options.silgi.composablesDir || SilgiCLIDefaults.silgi.composablesDir,
+  options.silgi.vfsDir = resolveSilgiPath(
+    options.silgi.vfsDir || SilgiCLIDefaults.silgi.vfsDir,
     options,
     options.rootDir
   );
@@ -412,11 +419,6 @@ async function resolvePathOptions(options) {
     options,
     options.rootDir
   );
-  options.silgi.servicesDir = resolveSilgiPath(
-    options.silgi.servicesDir || SilgiCLIDefaults.silgi.servicesDir,
-    options,
-    options.rootDir
-  );
   options.nodeModulesDirs.push(resolve(options.workspaceDir, "node_modules"));
   options.nodeModulesDirs.push(resolve(options.rootDir, "node_modules"));
   options.nodeModulesDirs.push(resolve(pkgDir, "node_modules"));
@@ -487,7 +489,7 @@ async function resolveStorageOptions(options) {
       base: fsMounts[p]
     };
   }
-  if (options.dev && options.storage.data === undefined && options.devStorage.data === undefined) {
+  if (options.dev && options.storage.data === void 0 && options.devStorage.data === void 0) {
     options.devStorage.data = {
       driver: "fs",
       base: resolve(options.rootDir, ".data/kv")
@@ -522,10 +524,8 @@ async function loadOptions(configOverrides = {}, opts = {}) {
   return options;
 }
 async function _loadUserConfig(configOverrides = {}, opts = {}) {
-  let presetOverride = configOverrides.preset || process.env.SILGI_PRESET;
-  if (configOverrides.dev) {
-    presetOverride = "silgi-dev";
-  }
+  const presetOverride = configOverrides.preset || process.env.SILGI_PRESET;
+  if (configOverrides.dev) ;
   configOverrides = klona(configOverrides);
   globalThis.defineSilgiConfig = globalThis.defineSilgiConfig || ((c) => c);
   let compatibilityDate = configOverrides.compatibilityDate || opts.compatibilityDate || (process.env.SILGI_COMPATIBILITY_DATE || process.env.SERVER_COMPATIBILITY_DATE || process.env.COMPATIBILITY_DATE);
@@ -609,7 +609,7 @@ function renderAttr(key, value) {
 async function silgiGenerateType(silgi) {
   const rootDirWithSlash = withTrailingSlash(silgi.options.rootDir);
   const tsConfigPath = resolve(
-    silgi.options.build.dir,
+    silgi.options.rootDir,
     silgi.options.typescript.tsconfigPath
   );
   const tsconfigDir = dirname(tsConfigPath);
@@ -659,9 +659,22 @@ async function silgiGenerateType(silgi) {
       allowImportingTsExtensions: true,
       ...silgi.options.typescript.customConditions ? { customConditions: ["silgiTypes"] } : {},
       paths: {
-        "#imports": [
+        "#silgiImports": [
           relativeWithDot(tsconfigDir, join(silgi.options.build.typesDir, "silgi-imports"))
-        ]
+        ],
+        ...silgi.scanModules.reduce((acc, m) => {
+          if (m.entryPath) {
+            acc[m.meta.name] = [relativeWithDot(tsconfigDir, m.entryPath)];
+          }
+          return acc;
+        }, {}),
+        ...silgi.scanModules.reduce((acc, m) => {
+          if (m.entryPath) {
+            const directory = getDirectory(m.entryPath);
+            acc[`${m.meta.name}/*`] = [`${relativeWithDot(tsconfigDir, directory)}/*`];
+          }
+          return acc;
+        }, {})
         // ...(silgi.options.typescript?.internalPaths
         //   ? {
         //       'silgi/runtime': [
@@ -817,6 +830,9 @@ function normalizeResult(result) {
   }
   return result;
 }
+function tryUseSilgi() {
+  return silgiCtx.tryUse();
+}
 
 var HttpStatus = /* @__PURE__ */ ((HttpStatus2) => {
   HttpStatus2[HttpStatus2["CONTINUE"] = 100] = "CONTINUE";
@@ -1036,7 +1052,7 @@ ${this.stack}`;
     }
     return ErrorFactory.internalError(
       error instanceof Error ? error.message : String(error),
-      error instanceof Error ? error : undefined
+      error instanceof Error ? error : void 0
     );
   }
 }
@@ -1049,18 +1065,14 @@ function parseURI(uri, uris) {
     throw ErrorFactory.create({
       message: "URI cannot be empty",
       httpStatus: HttpStatus.BAD_REQUEST,
-      context: {
-        uri
-      }
+      context: { uri }
     });
   }
   if (!uris) {
     throw ErrorFactory.create({
       message: "URIs configuration is not provided",
       httpStatus: HttpStatus.INTERNAL_SERVER_ERROR,
-      context: {
-        uri
-      }
+      context: { uri }
     });
   }
   const cleanUri = uri.replace(/^\/*(srn\/)?/, "").replace(/\/*$/, "");
@@ -1068,31 +1080,21 @@ function parseURI(uri, uris) {
   const parts = path.split("/");
   const query = queryString ? Object.fromEntries(
     queryString.split("&").map((param) => param.split("="))
-  ) : undefined;
-  const method = query?.method ? query?.method.toLowerCase() : undefined;
-  if (method && parts.length < 3 || !method && parts.length < 4) {
-    throw ErrorFactory.create({
-      message: "Invalid URI format: Insufficient path segments",
-      httpStatus: HttpStatus.BAD_REQUEST,
-      context: {
-        uri,
-        cleanUri,
-        partsLength: parts.length,
-        method,
-        expectedMinLength: method ? 3 : 4
-      }
-    });
-  }
+  ) : void 0;
+  const method = query?.method ? query?.method.toLowerCase() : void 0;
   const namespaceName = parts[0];
   const serviceName = parts[1];
   const methodName = method || parts[2];
   const actionName = method ? parts[2] : parts[3];
   if (!namespaceName || !serviceName || !methodName || !actionName) {
     throw ErrorFactory.create({
-      message: "Invalid URI format: Missing required path segments",
+      message: "Invalid URI format: Insufficient path segments",
       httpStatus: HttpStatus.BAD_REQUEST,
       context: {
         uri,
+        cleanUri,
+        partsLength: parts.length,
+        method,
         namespaceName,
         serviceName,
         methodName,
@@ -1100,24 +1102,14 @@ function parseURI(uri, uris) {
       }
     });
   }
-  const hasParameters = parts.length > 4;
   const baseUri = `${namespaceName}/${serviceName}/${methodName}/${actionName}`;
+  const paramStartIndex = method ? 3 : 4;
+  const parameters = parts.slice(paramStartIndex);
+  const normalizedUri = method ? `${namespaceName}/${serviceName}/${method}/${actionName}${parameters.length ? `/${parameters.join("/")}` : ""}` : cleanUri;
   const template = uris[baseUri];
-  if (template === "") {
-    if (hasParameters) {
-      throw ErrorFactory.create({
-        message: "Parameters are not allowed for this route",
-        httpStatus: HttpStatus.BAD_REQUEST,
-        context: {
-          uri,
-          baseUri,
-          extraParams: parts.slice(4)
-        }
-      });
-    }
-  } else if (!template) {
+  if (template === void 0) {
     throw ErrorFactory.create({
-      message: "Route not found",
+      message: "No route found for URI",
       httpStatus: HttpStatus.NOT_FOUND,
       context: {
         uri,
@@ -1125,59 +1117,69 @@ function parseURI(uri, uris) {
       }
     });
   }
-  const routeTemplate = typeof template === "string" ? template : template.pattern;
-  const validators = typeof template === "string" ? undefined : template.validators;
-  const routerParams = {};
-  if (routeTemplate === "") {
-    if (parts.length > 4) {
+  if (template === "") {
+    if (parameters.length > 0) {
       throw ErrorFactory.create({
-        message: "Parameters are not allowed for this route",
+        message: "No parameters expected for this route",
         httpStatus: HttpStatus.BAD_REQUEST,
         context: {
           uri,
           baseUri,
-          extraParams: parts.slice(4)
+          extraParams: parameters
         }
       });
     }
-  } else {
-    const templateParts = routeTemplate.split("/").filter(Boolean);
-    const paramValues = parts.slice(4);
-    let valueIndex = 0;
-    templateParts.forEach((part) => {
-      if (part.startsWith(":")) {
-        const paramName = part.substring(1);
-        const paramValue = paramValues[valueIndex];
-        if (validators?.[paramName] && paramValue) {
-          if (!validators[paramName](paramValue)) {
-            throw ErrorFactory.create({
-              message: `Invalid parameter value: ${paramName}`,
-              httpStatus: HttpStatus.UNPROCESSABLE_ENTITY,
-              context: {
-                uri,
-                paramName,
-                paramValue,
-                validatorName: paramName
-              }
-            });
-          }
+    return {
+      namespaceName,
+      serviceName,
+      methodName,
+      actionName,
+      raw: normalizedUri,
+      parts: [namespaceName, serviceName, methodName, actionName],
+      routerParams: {},
+      query: method ? void 0 : query,
+      uri: baseUri
+    };
+  }
+  const routeTemplate = typeof template === "string" ? template : template.pattern;
+  const validators = typeof template === "string" ? void 0 : template.validators;
+  const routerParams = {};
+  const templateParts = routeTemplate.split("/").filter(Boolean);
+  const paramValues = parameters;
+  let valueIndex = 0;
+  templateParts.forEach((part) => {
+    if (part.startsWith(":")) {
+      const paramName = part.substring(1);
+      const paramValue = paramValues[valueIndex];
+      if (validators?.[paramName] && paramValue) {
+        if (!validators[paramName](paramValue)) {
+          throw ErrorFactory.create({
+            message: "Invalid value for parameter",
+            httpStatus: HttpStatus.UNPROCESSABLE_ENTITY,
+            context: {
+              uri,
+              paramName,
+              paramValue,
+              validatorName: paramName
+            }
+          });
         }
-        routerParams[paramName] = paramValue || undefined;
-        valueIndex++;
-      } else if (part && part === paramValues[valueIndex]) {
-        valueIndex++;
       }
-    });
-  }
+      routerParams[paramName] = paramValue || void 0;
+      valueIndex++;
+    } else if (part && part === paramValues[valueIndex]) {
+      valueIndex++;
+    }
+  });
   return {
     namespaceName,
     serviceName,
     methodName,
     actionName,
-    raw: cleanUri,
+    raw: normalizedUri,
     parts: [namespaceName, serviceName, methodName, actionName],
     routerParams,
-    query,
+    query: method ? void 0 : query,
     uri: baseUri
   };
 }
@@ -1229,7 +1231,7 @@ async function createStorage(silgi) {
   }
   return storage;
 }
-function useStorage(base = "/memory:cache") {
+function useSilgiStorage(base = "/memory:cache") {
   const silgi = useSilgi();
   return base ? prefixStorage(silgi.storage, base) : silgi.storage;
 }
@@ -1289,14 +1291,14 @@ async function createSilgi(config) {
   await applyDefaults(SilgiConfigSchema, config.options);
   const silgi = {
     schemas: config.schemas,
-    services: config.services,
-    shared: config.shared,
-    uris: config.uris,
-    modulesURIs: config.modulesURIs,
+    services: config.services ?? {},
+    shared: config.shared ?? void 0,
+    uris: config.uris ?? {},
+    modulesURIs: config.modulesURIs ?? {},
     scannedHandlers: /* @__PURE__ */ new Map(),
     plugins: config.plugins ?? [],
-    framework: config.framework,
-    storage: undefined,
+    framework: config.framework ?? void 0,
+    storage: config.storage ?? void 0,
     options: config.options,
     hooks,
     callHook: hooks.callHook,
@@ -1326,9 +1328,11 @@ async function createSilgi(config) {
   };
   await runSilgiPlugins(silgi);
   await scanAction(silgi);
-  silgi.storage = await createStorage(silgi);
+  if (!silgi.storage) {
+    silgi.storage = await createStorage(silgi);
+  }
   silgi.shared.storage = (...data) => {
-    return useStorage(...data);
+    return useSilgiStorage(...data);
   };
   if (silgiCtx.tryUse()) {
     silgiCtx.unset();
@@ -1412,7 +1416,7 @@ class SchemaParser {
     const data = [];
     for (const item of this.parseVariableDeclaration(ast)) {
       for (const declaration of item.declaration.declarations) {
-        if (declaration.init.callee?.name === find) {
+        if (declaration.init?.callee?.name === find) {
           const options = {};
           if (declaration.init.arguments) {
             for (const argument of declaration.init.arguments) {
@@ -1496,10 +1500,10 @@ class SchemaParser {
   //     if (!item?.declaration?.extends)
   //       continue
   //     for (const declaration of item?.declaration?.extends) {
-  //       if (declaration.expression.name === 'SilgiModuleOptions') {
+  //       if (declaration.expression.name === 'ModuleOptions') {
   //         data.export.push({
   //           name: item.declaration.id.name,
-  //           as: camelCase(`${data.name}SilgiModuleOptions`),
+  //           as: camelCase(`${data.name}ModuleOptions`),
   //           type: true,
   //         })
   //       }
@@ -1572,7 +1576,7 @@ async function execute(uriString, input, event) {
     });
     if (!cached) {
       if (success && cacheData?.cachedKey && handler.storage) {
-        await useStorage(handler.storage.base).setItem(cacheData.cachedKey, result, handler.storage.options);
+        await useSilgiStorage(handler.storage.base).setItem(cacheData.cachedKey, result, handler.storage.options);
       }
     }
     return result;
@@ -1601,7 +1605,7 @@ async function cacheExecute(input, operation, handler, event) {
     requestId: event?.requestId
   }) : null;
   if (cacheKey) {
-    const cachedResult = await useStorage(handler.storage.base).getItem(cacheKey);
+    const cachedResult = await useSilgiStorage(handler.storage.base).getItem(cacheKey);
     if (cachedResult !== null) {
       return {
         success: true,
@@ -1659,4 +1663,16 @@ function createShared(shared) {
   return shared;
 }
 
-export { ErrorCategory, ErrorFactory, ErrorSeverity, HttpStatus, SchemaParser, SilgiError, createSchema, createService, createShared, createSilgi, createSilgiFetch, createStorage, getEvent, isBaseError, loadOptions, mergeSchemas, mergeServices, mergeShared, parseURI, silgi, silgiGenerateType, useSilgi };
+const silgiCLICtx = getContext("SilgiCLI");
+function useSilgiCLI() {
+  const instance = silgiCLICtx.tryUse();
+  if (!instance) {
+    throw new Error("Silgi instance is unavailable!");
+  }
+  return instance;
+}
+function tryUseSilgiCLI() {
+  return silgiCLICtx.tryUse();
+}
+
+export { ErrorCategory, ErrorFactory, ErrorSeverity, HttpStatus, SchemaParser, SilgiError, createSchema, createService, createShared, createSilgi, createSilgiFetch, createStorage, getEvent, isBaseError, loadOptions, mergeSchemas, mergeServices, mergeShared, parseURI, silgi, silgiCLICtx, silgiCtx, silgiGenerateType, tryUseSilgi, tryUseSilgiCLI, useSilgi, useSilgiCLI, useSilgiStorage };