silgi 0.5.0 → 0.7.0

package/dist/ecosystem/nitro/index.mjs

@@ -23,7 +23,7 @@ const module = {
     nitro.options.typescript.tsConfig.extends = "./silgi.tsconfig.json";
     nitro.options.typescript.tsConfig.include ??= [];
     nitro.options.typescript.tsConfig.exclude ??= [];
-    if (silgiConfig.typescript.internalPaths) {
+    if (silgiConfig.typescript.internalPaths || silgiConfig.stub) {
       nitro.options.alias ||= {};
       nitro.options.alias = {
         ...nitro.options.alias,
@@ -35,8 +35,11 @@ const module = {
     nitro.options.typescript.tsConfig.compilerOptions ??= {};
     nitro.options.typescript.tsConfig.compilerOptions.paths ??= {};
     nitro.hooks.hook("types:extend", async () => {
-      execSync("pnpm silgi prepare", { stdio: "inherit", cwd: nitro.options.rootDir, env: process.env });
+      const isStub = silgiConfig.stub ? "pnpm silgi prepare --stub" : "pnpm silgi prepare";
+      execSync(isStub, { stdio: "inherit", cwd: nitro.options.rootDir, env: process.env });
     });
+    nitro.options.exportConditions ??= [];
+    nitro.options.exportConditions.push(...silgiConfig.conditions);
     if (nitro.options.imports) {
       nitro.options.imports.dirs ??= [];
       nitro.options.imports.dirs.push(

package/dist/kit/index.d.mts

@@ -1,22 +1,7 @@
 import { Buffer } from 'node:buffer';
-import { GraphQLSchema } from 'graphql';
-import { SilgiCLI, GraphQLJSON, SilgiPreset, SilgiPresetMeta } from 'silgi/types';
-import { M as ModuleOptions, a as ModuleDefinition, S as SilgiModule } from '../shared/silgi.CN_giHTc.mjs';
-import 'defu';
-import '@graphql-tools/utils';
-import 'pkg-types';
-import '@standard-schema/spec';
-import 'consola';
-import 'hookable';
-import 'ignore';
-import 'silgi/presets';
-import 'unimport';
-import 'unstorage';
-import 'c12';
-import 'chokidar';
-import 'compatx';
-import 'unimport/unplugin';
-import 'std-env';
+import * as consola from 'consola';
+import { ConsolaOptions } from 'consola';
+import { ModuleOptionsCustom, ModuleDefinition, SilgiModule, SilgiCLI, SilgiPreset, SilgiPresetMeta, SilgiTemplate, ResolvedSilgiTemplate } from 'silgi/types';
 
 /**
  * Resolve a module from a given root path using an algorithm patterned on
@@ -29,20 +14,18 @@ declare function tryResolveModule(id: string, url?: string | string[]): Promise<
 declare function writeFile(file: string, contents: Buffer | string, log?: boolean): Promise<void>;
 declare function isDirectory(path: string): Promise<boolean>;
 
-declare function exportGraphQLInterfaceType(silgi: SilgiCLI, schema: GraphQLSchema): void;
-
-declare function extractGraphQLSchemaToJSON(schema: GraphQLSchema): GraphQLJSON;
-
 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.
  */
-declare function defineSilgiModule<TOptions extends ModuleOptions>(definition: ModuleDefinition<TOptions, Partial<TOptions>, false> | SilgiModule<TOptions, Partial<TOptions>, false>): SilgiModule<TOptions, TOptions, false>;
-declare function defineSilgiModule<TOptions extends ModuleOptions>(): {
+declare function defineSilgiModule<TOptions extends ModuleOptionsCustom>(definition: ModuleDefinition<TOptions, Partial<TOptions>, false> | SilgiModule<TOptions, Partial<TOptions>, false>): SilgiModule<TOptions, TOptions, false>;
+declare function defineSilgiModule<TOptions extends ModuleOptionsCustom>(): {
     with: <TOptionsDefaults extends Partial<TOptions>>(definition: ModuleDefinition<TOptions, TOptionsDefaults, true> | SilgiModule<TOptions, TOptionsDefaults, true>) => SilgiModule<TOptions, TOptionsDefaults, true>;
 };
 
@@ -88,6 +71,25 @@ interface Resolver {
 declare function createResolver(base: string | URL): Resolver;
 declare function resolveSilgiModule(base: string, paths: string[]): Promise<string[]>;
 
+/**
+ * Renders given template during build into the virtual file system (and optionally to disk in the project `buildDir`)
+ */
+declare function addTemplate<T>(_template: SilgiTemplate<T> | string): ResolvedSilgiTemplate<T>;
+/**
+ * Normalize a silgi template object
+ */
+declare function normalizeTemplate<T>(template: SilgiTemplate<T> | string, buildDir?: string): ResolvedSilgiTemplate<T>;
+
 declare function relativeWithDot(from: string, to: string): string;
+/** @since 3.9.0 */
+declare function toArray<T>(value: T | T[]): T[];
+/**
+ * Filter out items from an array in place. This function mutates the array.
+ * `predicate` get through the array from the end to the start for performance.
+ *
+ * This function should be faster than `Array.prototype.filter` on large arrays.
+ */
+declare function filterInPlace<T>(array: T[], predicate: (item: T, index: number, arr: T[]) => unknown): T[];
+declare const MODE_RE: RegExp;
 
-export { createResolver, defineSilgiModule, defineSilgiPreset, exportGraphQLInterfaceType, extractGraphQLSchemaToJSON, isDirectory, isH3, isNitro, isNuxt, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, tryResolveModule, writeFile };
+export { MODE_RE, addTemplate, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, toArray, tryResolveModule, useLogger, writeFile };

package/dist/kit/index.d.ts

@@ -1,22 +1,7 @@
 import { Buffer } from 'node:buffer';
-import { GraphQLSchema } from 'graphql';
-import { SilgiCLI, GraphQLJSON, SilgiPreset, SilgiPresetMeta } from 'silgi/types';
-import { M as ModuleOptions, a as ModuleDefinition, S as SilgiModule } from '../shared/silgi.CN_giHTc.js';
-import 'defu';
-import '@graphql-tools/utils';
-import 'pkg-types';
-import '@standard-schema/spec';
-import 'consola';
-import 'hookable';
-import 'ignore';
-import 'silgi/presets';
-import 'unimport';
-import 'unstorage';
-import 'c12';
-import 'chokidar';
-import 'compatx';
-import 'unimport/unplugin';
-import 'std-env';
+import * as consola from 'consola';
+import { ConsolaOptions } from 'consola';
+import { ModuleOptionsCustom, ModuleDefinition, SilgiModule, SilgiCLI, SilgiPreset, SilgiPresetMeta, SilgiTemplate, ResolvedSilgiTemplate } from 'silgi/types';
 
 /**
  * Resolve a module from a given root path using an algorithm patterned on
@@ -29,20 +14,18 @@ declare function tryResolveModule(id: string, url?: string | string[]): Promise<
 declare function writeFile(file: string, contents: Buffer | string, log?: boolean): Promise<void>;
 declare function isDirectory(path: string): Promise<boolean>;
 
-declare function exportGraphQLInterfaceType(silgi: SilgiCLI, schema: GraphQLSchema): void;
-
-declare function extractGraphQLSchemaToJSON(schema: GraphQLSchema): GraphQLJSON;
-
 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.
  */
-declare function defineSilgiModule<TOptions extends ModuleOptions>(definition: ModuleDefinition<TOptions, Partial<TOptions>, false> | SilgiModule<TOptions, Partial<TOptions>, false>): SilgiModule<TOptions, TOptions, false>;
-declare function defineSilgiModule<TOptions extends ModuleOptions>(): {
+declare function defineSilgiModule<TOptions extends ModuleOptionsCustom>(definition: ModuleDefinition<TOptions, Partial<TOptions>, false> | SilgiModule<TOptions, Partial<TOptions>, false>): SilgiModule<TOptions, TOptions, false>;
+declare function defineSilgiModule<TOptions extends ModuleOptionsCustom>(): {
     with: <TOptionsDefaults extends Partial<TOptions>>(definition: ModuleDefinition<TOptions, TOptionsDefaults, true> | SilgiModule<TOptions, TOptionsDefaults, true>) => SilgiModule<TOptions, TOptionsDefaults, true>;
 };
 
@@ -88,6 +71,25 @@ interface Resolver {
 declare function createResolver(base: string | URL): Resolver;
 declare function resolveSilgiModule(base: string, paths: string[]): Promise<string[]>;
 
+/**
+ * Renders given template during build into the virtual file system (and optionally to disk in the project `buildDir`)
+ */
+declare function addTemplate<T>(_template: SilgiTemplate<T> | string): ResolvedSilgiTemplate<T>;
+/**
+ * Normalize a silgi template object
+ */
+declare function normalizeTemplate<T>(template: SilgiTemplate<T> | string, buildDir?: string): ResolvedSilgiTemplate<T>;
+
 declare function relativeWithDot(from: string, to: string): string;
+/** @since 3.9.0 */
+declare function toArray<T>(value: T | T[]): T[];
+/**
+ * Filter out items from an array in place. This function mutates the array.
+ * `predicate` get through the array from the end to the start for performance.
+ *
+ * This function should be faster than `Array.prototype.filter` on large arrays.
+ */
+declare function filterInPlace<T>(array: T[], predicate: (item: T, index: number, arr: T[]) => unknown): T[];
+declare const MODE_RE: RegExp;
 
-export { createResolver, defineSilgiModule, defineSilgiPreset, exportGraphQLInterfaceType, extractGraphQLSchemaToJSON, isDirectory, isH3, isNitro, isNuxt, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, tryResolveModule, writeFile };
+export { MODE_RE, addTemplate, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, toArray, tryResolveModule, useLogger, writeFile };

package/dist/kit/index.mjs

@@ -1,19 +1,18 @@
 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 } from 'pathe';
+import { relative, resolve, dirname, normalize, isAbsolute, join, parse, basename } from 'pathe';
 import { colors } from 'consola/utils';
 import { getProperty } from 'dot-prop';
-import { extractGraphQLSchemaToJSON as extractGraphQLSchemaToJSON$1 } from 'silgi/kit';
-import { useSilgi } from 'silgi/core';
+import { useSilgi, tryUseSilgiCLI, useSilgiCLI } from 'silgi/core';
 import { defu } from 'defu';
-import { u as useSilgiCLI, c as checkSilgiCompatibility, t as tryUseSilgiCLI } from '../cli/compatibility.mjs';
+import { c as checkSilgiCompatibility } from '../cli/compatibility.mjs';
 import { existsSync, promises } from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import { resolveAlias as resolveAlias$1 } from 'pathe/utils';
+import { hash } from 'ohash';
 import 'semver/functions/satisfies.js';
 import 'silgi/meta';
-import 'unctx';
 
 async function tryResolveModule(id, url = import.meta.url) {
   try {
@@ -55,7 +54,7 @@ async function writeFile(file, contents, log = false) {
   await fsp.writeFile(
     file,
     contents,
-    typeof contents === "string" ? "utf8" : undefined
+    typeof contents === "string" ? "utf8" : void 0
   );
   if (log) {
     consola$1.info("Generated", prettyPath(file));
@@ -69,102 +68,6 @@ async function isDirectory$1(path) {
   }
 }
 
-function exportGraphQLInterfaceType(silgi, schema) {
-  const schemasJSON = extractGraphQLSchemaToJSON$1(schema);
-  for (const [key, schemaValue] of Object.entries(schemasJSON)) {
-    if (key === "queries") {
-      for (const [queryKey, _queryValue] of Object.entries(schemaValue)) {
-      }
-    }
-    if (key === "mutations") {
-      for (const [mutationKey, _mutationValue] of Object.entries(schemaValue)) {
-      }
-    }
-    if (key === "types") {
-      for (const [typeName, typeValue] of Object.entries(schemaValue)) {
-        if (typeof typeValue === "string" && typeValue.startsWith("$ref:")) {
-          const refName = typeValue.replace("$ref:", "");
-          const refFields = schemasJSON.references?.[refName];
-          if (refFields) {
-            for (const fieldName of Object.keys(refFields)) {
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-function extractGraphQLSchemaToJSON(schema) {
-  const result = {
-    queries: {},
-    mutations: {},
-    types: {},
-    inputs: {},
-    references: {}
-    // Schema içindeki tüm referansları tutacak
-  };
-  function getTypeReference(type) {
-    if (["GraphQLScalarType", "GraphQLEnumType"].includes(type.constructor.name)) {
-      return type.name;
-    }
-    const typeName = type.name.toLowerCase();
-    if (!result.references[typeName]) {
-      const fields = {};
-      const typeFields = type.constructor.name === "GraphQLInputObjectType" ? type.getFields() : type._fields;
-      Object.entries(typeFields || {}).forEach(([fieldName, field]) => {
-        if (field?.type) {
-          if (["GraphQLObjectType", "GraphQLInputObjectType"].includes(field.type.constructor.name)) {
-            fields[fieldName] = `$ref:${field.type.name.toLowerCase()}`;
-          } else {
-            fields[fieldName] = field.type.name;
-          }
-        }
-      });
-      result.references[typeName] = fields;
-    }
-    return `$ref:${typeName}`;
-  }
-  Object.entries(schema.getQueryType()?.getFields() || {}).forEach(([name, field]) => {
-    result.queries[name] = {
-      input: {},
-      output: field.type.name === "String" ? "String" : `$ref:${field.type.name.toLowerCase()}`
-    };
-    if (field.args?.length) {
-      field.args.forEach((arg) => {
-        result.queries[name].input[arg.name] = getTypeReference(arg.type);
-      });
-    }
-  });
-  Object.entries(schema.getMutationType()?.getFields() || {}).forEach(([name, field]) => {
-    result.mutations[name] = {
-      input: {},
-      output: field.type.name === "String" ? "String" : `$ref:${field.type.name.toLowerCase()}`
-    };
-    if (field.args?.length) {
-      field.args.forEach((arg) => {
-        result.mutations[name].input[arg.name] = getTypeReference(arg.type);
-      });
-    }
-  });
-  Object.entries(schema.getTypeMap()).forEach(([typeName, type]) => {
-    if (typeName.startsWith("__") || ["Query", "Mutation"].includes(typeName)) {
-      return;
-    }
-    if (["GraphQLScalarType", "GraphQLEnumType"].includes(type.constructor.name)) {
-      return;
-    }
-    const typeKey = typeName.toLowerCase();
-    if (type.constructor.name === "GraphQLInputObjectType") {
-      result.inputs[typeKey] = `$ref:${typeKey}`;
-    } else {
-      result.types[typeKey] = `$ref:${typeKey}`;
-    }
-    getTypeReference(type);
-  });
-  return result;
-}
-
 function isNuxt() {
   const silgi = useSilgi();
   if (silgi.options.present === "nitro" || silgi.options.present === "h3" || silgi.options.present === "nuxt") {
@@ -187,6 +90,11 @@ function isH3() {
   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);
@@ -335,5 +243,57 @@ const RELATIVE_RE = /^([^.])/;
 function relativeWithDot(from, to) {
   return relative(from, to).replace(RELATIVE_RE, "./$1") || ".";
 }
+function toArray(value) {
+  return Array.isArray(value) ? value : [value];
+}
+function filterInPlace(array, predicate) {
+  for (let i = array.length; i--; i >= 0) {
+    if (!predicate(array[i], i, array)) {
+      array.splice(i, 1);
+    }
+  }
+  return array;
+}
+const MODE_RE = /\.(server|client)(\.\w+)*$/;
+
+function addTemplate(_template) {
+  const silgi = useSilgiCLI();
+  const template = normalizeTemplate(_template);
+  filterInPlace(silgi.options.build.templates, (p) => normalizeTemplate(p).dst !== template.dst);
+  silgi.options.build.templates.push(template);
+  return template;
+}
+function normalizeTemplate(template, buildDir) {
+  if (!template) {
+    throw new Error(`Invalid template: ${JSON.stringify(template)}`);
+  }
+  if (typeof template === "string") {
+    template = { src: template };
+  } else {
+    template = { ...template };
+  }
+  if (template.src) {
+    if (!existsSync(template.src)) {
+      throw new Error(`Template not found: ${template.src}`);
+    }
+    if (!template.filename) {
+      const srcPath = parse(template.src);
+      template.filename = template.fileName || `${basename(srcPath.dir)}.${srcPath.name}.${hash(template.src)}${srcPath.ext}`;
+    }
+  }
+  if (!template.src && !template.getContents) {
+    throw new Error(`Invalid template. Either \`getContents\` or \`src\` should be provided: ${JSON.stringify(template)}`);
+  }
+  if (!template.filename) {
+    throw new Error(`Invalid template. \`filename\` must be provided: ${JSON.stringify(template)}`);
+  }
+  if (template.filename.endsWith(".d.ts")) {
+    template.write = true;
+  }
+  if (!template.dst) {
+    template.dst = resolve(buildDir ?? useSilgiCLI().options.silgi.serverDir, template.filename);
+  }
+  return template;
+}
 
-export { createResolver, defineSilgiModule, defineSilgiPreset, exportGraphQLInterfaceType, extractGraphQLSchemaToJSON, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, tryResolveModule, writeFile };
+export { MODE_RE, addTemplate, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, toArray, tryResolveModule, useLogger, writeFile };

package/dist/meta/index.d.mts

@@ -1,3 +1,3 @@
-const version = "0.5.0";
+const version = "0.7.0";
 
 export { version };

package/dist/meta/index.d.ts

@@ -1,3 +1,3 @@
-const version = "0.5.0";
+const version = "0.7.0";
 
 export { version };

package/dist/runtime/internal/nitro.mjs

@@ -1,4 +1,4 @@
-import { createError, defineEventHandler, getQuery, H3Error, readBody, setResponseStatus } from "h3";
+import { createError, defineEventHandler, getQuery, H3Error, readBody } from "h3";
 import { silgi, SilgiError, useSilgi } from "silgi/core";
 export default async function addNitroApp(silgiCtx = useSilgi()) {
   const nitro = silgiCtx.framework;
@@ -30,7 +30,6 @@ export default async function addNitroApp(silgiCtx = useSilgi()) {
       }
     } catch (error) {
       if (error instanceof H3Error) {
-        setResponseStatus(event, error.statusCode);
         throw createError({
           statusCode: error.statusCode,
           message: error.message,

package/dist/shared/{silgi.DGmIWx95.d.mts → silgi.BFbL2aof.d.mts}

@@ -6,6 +6,6 @@ declare function silgi(event?: SilgiEvent | Record<string, any>): {
 };
 
 declare function createStorage(silgi: Silgi): Promise<Storage<StorageValue>>;
-declare function useStorage<T extends StorageValue = StorageValue>(base?: StorageConfig<T>['base']): Storage<T>;
+declare function useSilgiStorage<T extends StorageValue = StorageValue>(base?: StorageConfig<T>['base'] | (string & {})): Storage<T>;
 
-export { createStorage as c, silgi as s, useStorage as u };
+export { createStorage as c, silgi as s, useSilgiStorage as u };

package/dist/shared/{silgi.DGmIWx95.d.ts → silgi.BFbL2aof.d.ts}

@@ -6,6 +6,6 @@ declare function silgi(event?: SilgiEvent | Record<string, any>): {
 };
 
 declare function createStorage(silgi: Silgi): Promise<Storage<StorageValue>>;
-declare function useStorage<T extends StorageValue = StorageValue>(base?: StorageConfig<T>['base']): Storage<T>;
+declare function useSilgiStorage<T extends StorageValue = StorageValue>(base?: StorageConfig<T>['base'] | (string & {})): Storage<T>;
 
-export { createStorage as c, silgi as s, useStorage as u };
+export { createStorage as c, silgi as s, useSilgiStorage as u };