silgi 0.11.1 → 0.11.3

package/dist/_chunks/index.mjs

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

package/dist/cli/dev.mjs

@@ -19,7 +19,6 @@ import './env.mjs';
 import '@clack/prompts';
 import 'dotenv';
 import 'mlly';
-import 'scule';
 import 'dev-jiti';
 import 'node:url';
 import 'defu';

package/dist/cli/prepare.mjs

@@ -16,7 +16,6 @@ import './env.mjs';
 import '@clack/prompts';
 import 'dotenv';
 import 'mlly';
-import 'scule';
 import 'dev-jiti';
 import './compatibility.mjs';
 import 'semver/functions/satisfies.js';

package/dist/cli/writeTypesAndFiles.mjs

@@ -4,13 +4,12 @@ import consola$1, { consola } from 'consola';
 import { createHooks, createDebugger } from 'hookable';
 import { join, resolve, isAbsolute, relative, dirname, basename, extname } from 'pathe';
 import { useSilgiCLI, silgiCLICtx } from 'silgi/core';
-import { relativeWithDot, resolveAlias, resolvePath, writeFile, hash, normalizeTemplate, useLogger, addTemplate, applyEnv, hasError as hasError$1, isDirectory } from 'silgi/kit';
+import { relativeWithDot, hash, resolveAlias, resolvePath, writeFile, normalizeTemplate, useLogger, addTemplate, applyEnv, hasError as hasError$1, isDirectory } from 'silgi/kit';
 import { runtimeDir } from 'silgi/runtime/meta';
 import { autoImportTypes } from 'silgi/types';
 import { scanExports, createUnimport, toExports } from 'unimport';
 import { p as prepareEnv } from './env.mjs';
 import { resolveModuleExportNames, resolve as resolve$1, resolvePath as resolvePath$1, parseNodeModulePath, lookupNodeModuleSubpath } from 'mlly';
-import { pascalCase } from 'scule';
 import { createJiti } from 'dev-jiti';
 import { a as hasInstalledModule, h as hasError } from './compatibility.mjs';
 import { pathToFileURL, fileURLToPath } from 'node:url';
@@ -117,7 +116,11 @@ async function nitroFramework(silgi, skip = false) {
   silgi.hook("prepare:schema.ts", (data) => {
     data.importItems.nitropack = {
       import: [
-        { name: "NitroApp", type: true }
+        {
+          name: "NitroApp",
+          type: true,
+          key: "NitroApp"
+        }
       ],
       from: "nitropack/types"
     };
@@ -132,7 +135,11 @@ async function nitroFramework(silgi, skip = false) {
   silgi.hook("prepare:createDTSFramework", (data) => {
     data.importItems["nitropack/types"] = {
       import: [
-        { name: "NitroRuntimeConfig", type: true }
+        {
+          name: "NitroRuntimeConfig",
+          type: true,
+          key: "NitroRuntimeConfig"
+        }
       ],
       from: "nitropack/types"
     };
@@ -229,74 +236,83 @@ async function registerModuleExportScan(silgi) {
       };
       const exportedTypes = exports.filter((exp) => exp.type).map((exp) => exp.name);
       if (exportedTypes.includes("ModuleOptions")) {
-        const importName = pascalCase(`${configKey}Config`);
+        const importName = `_${hash(`${configKey}ModuleOptions`)}`;
         options.importItems[configKey].import.push({
           name: `ModuleOptions as ${importName}`,
-          type: true
+          type: true,
+          key: importName
         });
         options.options.push({ key: configKey, value: importName });
       }
-      if (exportedTypes.includes("SilgiRuntimeOptions")) {
-        const importName = pascalCase(`${configKey}RuntimeConfig`);
+      if (exportedTypes.includes("ModuleRuntimeOptions")) {
+        const importName = `_${hash(`${configKey}ModuleRuntimeOptions`)}`;
         options.importItems[configKey].import.push({
-          name: `SilgiRuntimeOptions as ${importName}`,
-          type: true
+          name: `ModuleRuntimeOptions as ${importName}`,
+          type: true,
+          key: importName
         });
         options.runtimeOptions.push({ key: configKey, value: importName });
       }
-      if (exportedTypes.includes("ModuleRuntimeContext")) {
-        const importName = pascalCase(`${configKey}RuntimeContext`);
+      if (exportedTypes.includes("ModuleRuntimeShareds")) {
+        const importName = `_${hash(`${configKey}ModuleRuntimeShareds`)}`;
         options.importItems[configKey].import.push({
-          name: `ModuleRuntimeContext as ${importName}`,
-          type: true
+          name: `ModuleRuntimeShareds as ${importName}`,
+          type: true,
+          key: importName
         });
         options.contexts.push({ key: configKey, value: importName });
       }
-      if (exportedTypes.includes("ModuleRuntimeAction")) {
-        const importName = pascalCase(`${configKey}Action`);
+      if (exportedTypes.includes("ModuleEvents")) {
+        const importName = `_${hash(`${configKey}ModuleEvents`)}`;
         options.importItems[configKey].import.push({
-          name: `ModuleRuntimeAction as ${importName}`,
-          type: true
+          name: `ModuleEvents as ${importName}`,
+          type: true,
+          key: importName
         });
         options.actions.push({ key: configKey, value: importName });
       }
-      if (exportedTypes.includes("ModuleRuntimeShareds")) {
-        const importName = pascalCase(`${configKey}Shared`);
+      if (exportedTypes.includes("ModuleRuntimeContexts")) {
+        const importName = `_${hash(`${configKey}ModuleRuntimeContexts`)}`;
         options.importItems[configKey].import.push({
-          name: `ModuleRuntimeShareds as ${importName}`,
-          type: true
+          name: `ModuleRuntimeContexts as ${importName}`,
+          type: true,
+          key: importName
         });
         options.shareds.push({ key: configKey, value: importName });
       }
       if (exportedTypes.includes("ModuleHooks")) {
-        const importName = pascalCase(`${configKey}Hooks`);
+        const importName = `_${hash(`${configKey}ModuleHooks`)}`;
         options.importItems[configKey].import.push({
           name: `ModuleHooks as ${importName}`,
-          type: true
+          type: true,
+          key: importName
         });
         options.hooks.push({ key: configKey, value: importName });
       }
       if (exportedTypes.includes("ModuleRuntimeHooks")) {
-        const importName = pascalCase(`${configKey}RuntimeHooks`);
+        const importName = `_${hash(`${configKey}RuntimeHooks`)}`;
         options.importItems[configKey].import.push({
           name: `ModuleRuntimeHooks as ${importName}`,
-          type: true
+          type: true,
+          key: importName
         });
         options.runtimeHooks.push({ key: configKey, value: importName });
       }
-      if (exportedTypes.includes("ModuleRuntimeOptions")) {
-        const importName = pascalCase(`${configKey}RuntimeOptions`);
+      if (exportedTypes.includes("ModuleRuntimeActions")) {
+        const importName = `_${hash(`${configKey}ModuleRuntimeActions`)}`;
         options.importItems[configKey].import.push({
-          name: `ModuleRuntimeOptions as ${importName}`,
-          type: true
+          name: `ModuleRuntimeActions as ${importName}`,
+          type: true,
+          key: importName
         });
         options.runtimeOptions.push({ key: configKey, value: importName });
       }
-      if (exportedTypes.includes("SilgiRuntimeMethods")) {
-        const importName = pascalCase(`${configKey}RuntimeMethods`);
+      if (exportedTypes.includes("ModuleRuntimeMethods")) {
+        const importName = `_${hash(`${configKey}ModuleRuntimeMethods`)}`;
         options.importItems[configKey].import.push({
-          name: `SilgiRuntimeMethods as ${importName}`,
-          type: true
+          name: `ModuleRuntimeMethods as ${importName}`,
+          type: true,
+          key: importName
         });
         options.methods.push({ key: configKey, value: importName });
       }

package/dist/core/index.d.mts

@@ -1,5 +1,5 @@
 import { SilgiConfig, Silgi, SilgiOperation, MergedSilgiSchema, ServiceType, SilgiSchema, RequiredServiceType, SilgiRuntimeSharedExtends, SilgiEvents, SilgiRuntimeContext, DefaultNamespaces, BaseSchemaType, SilgiRuntimeShareds, StorageConfig, SilgiCLI } from 'silgi/types';
-export { s as silgi } from '../shared/silgi.D608K9c5.mjs';
+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.d.ts

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

package/dist/core/index.mjs

@@ -541,12 +541,12 @@ async function createSilgi(config) {
 
 function silgi(event) {
   return {
-    execute: (uriString, input, source) => {
-      return execute(uriString, input, event, source);
+    execute: (uriString, input, source, queryParams) => {
+      return execute(uriString, input, event, source, queryParams);
     }
   };
 }
-async function execute(uriString, input, event, source) {
+async function execute(uriString, input, event, source, queryParams) {
   const silgiCtx = useSilgi();
   const config = {
     returnNull: false
@@ -589,7 +589,10 @@ async function execute(uriString, input, event, source) {
       success = cacheData.success;
       cached = cacheData.cached;
     } else {
-      const parameters = defu$1(operation.routerParams, operation.query) || {};
+      let parameters = defu$1(operation.routerParams, operation.query) || {};
+      if (queryParams) {
+        parameters = defu$1(queryParams, parameters);
+      }
       silgiCtx.shared.silgi = (_event) => silgi(_event || event);
       result = await handler?.handler(
         defu$1(input, { parameters }),

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.11.1";
+const version = "0.11.3";
 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.11.1";
+const version = "0.11.3";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",

package/dist/runtime/internal/nitro.mjs

@@ -14,9 +14,8 @@ export default async function addNitroApp(silgiCtx = useSilgi()) {
         newPath = `${event.path}?method=${event.method}`;
       }
       const data = await silgiConnect.execute(newPath, {
-        ...query,
         ...body
-      });
+      }, void 0, query);
       if (data) {
         return data;
       }

package/dist/shared/{silgi.D608K9c5.d.mts → silgi.Cs0ZUUXV.d.mts}

@@ -1,7 +1,7 @@
 import { SilgiEvents, SilgiURIs, ExtractInputFromURI, ExtractSourceFromURI, ExtractOutputFromURI } from 'silgi/types';
 
 declare function silgi(event?: SilgiEvents | Record<string, any>): {
-    execute: <TURI extends keyof SilgiURIs>(uriString: TURI, input: ExtractInputFromURI<TURI>, source?: ExtractSourceFromURI<TURI>) => Promise<ExtractOutputFromURI<TURI>>;
+    execute: <TURI extends keyof SilgiURIs>(uriString: TURI, input: ExtractInputFromURI<TURI>, source?: ExtractSourceFromURI<TURI>, queryParams?: Record<string, string>) => Promise<ExtractOutputFromURI<TURI>>;
 };
 
 export { silgi as s };

package/dist/shared/{silgi.D608K9c5.d.ts → silgi.Cs0ZUUXV.d.ts}

@@ -1,7 +1,7 @@
 import { SilgiEvents, SilgiURIs, ExtractInputFromURI, ExtractSourceFromURI, ExtractOutputFromURI } from 'silgi/types';
 
 declare function silgi(event?: SilgiEvents | Record<string, any>): {
-    execute: <TURI extends keyof SilgiURIs>(uriString: TURI, input: ExtractInputFromURI<TURI>, source?: ExtractSourceFromURI<TURI>) => Promise<ExtractOutputFromURI<TURI>>;
+    execute: <TURI extends keyof SilgiURIs>(uriString: TURI, input: ExtractInputFromURI<TURI>, source?: ExtractSourceFromURI<TURI>, queryParams?: Record<string, string>) => Promise<ExtractOutputFromURI<TURI>>;
 };
 
 export { silgi as s };

package/dist/types/index.d.mts

@@ -13,7 +13,7 @@ import { Unimport } from 'unimport';
 import { Storage, TransactionOptions, BuiltinDriverName, StorageValue } from 'unstorage';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import { ProviderName } from 'std-env';
-import { s as silgi } from '../shared/silgi.D608K9c5.mjs';
+import { s as silgi } from '../shared/silgi.Cs0ZUUXV.mjs';
 
 type HookResult = Promise<void> | void;
 

package/dist/types/index.d.ts

@@ -13,7 +13,7 @@ import { Unimport } from 'unimport';
 import { Storage, TransactionOptions, BuiltinDriverName, StorageValue } from 'unstorage';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import { ProviderName } from 'std-env';
-import { s as silgi } from '../shared/silgi.D608K9c5.js';
+import { s as silgi } from '../shared/silgi.Cs0ZUUXV.js';
 
 type HookResult = Promise<void> | void;
 

package/package.json

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