silgi 0.26.7 → 0.26.9

package/dist/build.d.mts

@@ -5,6 +5,8 @@ import { SilgiCLI, SilgiCLIConfig, LoadConfigOptions } from 'silgi/types';
  */
 declare function prepareBuild(silgi: SilgiCLI): Promise<void>;
 
+declare function generateApiFul(silgi: SilgiCLI): Promise<void>;
+
 declare function prepare(_silgi: SilgiCLI): Promise<void>;
 
 declare function createSilgiCLI(config?: SilgiCLIConfig, opts?: LoadConfigOptions): Promise<SilgiCLI>;
@@ -13,4 +15,4 @@ declare function writeCoreFile(silgi: SilgiCLI): Promise<void>;
 
 declare function writeTypesAndFiles(silgi: SilgiCLI): Promise<void>;
 
-export { createSilgiCLI, prepare, prepareBuild, writeCoreFile, writeTypesAndFiles };
+export { createSilgiCLI, generateApiFul, prepare, prepareBuild, writeCoreFile, writeTypesAndFiles };

package/dist/build.mjs

@@ -1,10 +1,11 @@
-export { c as createSilgiCLI, a as prepare, p as prepareBuild, w as writeCoreFile, b as writeTypesAndFiles } from './cli/writeTypesAndFiles.mjs';
+export { c as createSilgiCLI, g as generateApiFul, a as prepare, p as prepareBuild, w as writeCoreFile, b as writeTypesAndFiles } from './cli/writeTypesAndFiles.mjs';
 import 'knitwork';
 import 'pathe';
 import 'silgi/kit';
+import 'apiful/openapi';
+import 'consola';
 import 'node:fs';
 import 'node:fs/promises';
-import 'consola';
 import 'hookable';
 import 'silgi';
 import 'silgi/runtime/meta';
@@ -28,7 +29,6 @@ import '@oxc-parser/wasm';
 import 'klona';
 import 'silgi/runtime';
 import 'unstorage';
-import 'apiful/openapi';
 import 'scule';
 import './cli/types.mjs';
 import 'c12';

package/dist/cli/dev.mjs

@@ -11,6 +11,7 @@ import 'unctx';
 import './writeTypesAndFiles.mjs';
 import 'knitwork';
 import 'silgi/kit';
+import 'apiful/openapi';
 import 'node:fs';
 import 'node:fs/promises';
 import 'hookable';
@@ -34,7 +35,6 @@ import '@oxc-parser/wasm';
 import 'klona';
 import 'silgi/runtime';
 import 'unstorage';
-import 'apiful/openapi';
 import 'scule';
 import './types.mjs';
 import 'c12';

package/dist/cli/index.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { defineCommand, runMain } from 'citty';
 
-const version = "0.26.7";
+const version = "0.26.9";
 const packageJson = {
 	version: version};
 

package/dist/cli/init.mjs

@@ -9,6 +9,7 @@ import 'silgi/meta';
 import './writeTypesAndFiles.mjs';
 import 'knitwork';
 import 'silgi/kit';
+import 'apiful/openapi';
 import 'hookable';
 import 'silgi';
 import 'silgi/runtime/meta';
@@ -30,7 +31,6 @@ import '@oxc-parser/wasm';
 import 'klona';
 import 'silgi/runtime';
 import 'unstorage';
-import 'apiful/openapi';
 import 'scule';
 import './types.mjs';
 import 'c12';

package/dist/cli/install.mjs

@@ -9,6 +9,7 @@ import { l as loadOptions } from './types.mjs';
 import './writeTypesAndFiles.mjs';
 import 'knitwork';
 import 'silgi/kit';
+import 'apiful/openapi';
 import 'node:fs/promises';
 import 'hookable';
 import 'silgi';
@@ -32,7 +33,6 @@ import '@oxc-parser/wasm';
 import 'klona';
 import 'silgi/runtime';
 import 'unstorage';
-import 'apiful/openapi';
 import 'scule';
 import 'pathe/utils';
 import 'picocolors';

package/dist/cli/prepare.mjs

@@ -1,7 +1,7 @@
 import { defineCommand, runCommand } from 'citty';
 import { resolve } from 'pathe';
 import { version } from 'silgi/meta';
-import { d as prepareEnv, c as createSilgiCLI, a as prepare$2, b as writeTypesAndFiles, w as writeCoreFile, p as prepareBuild, g as generateApp } from './writeTypesAndFiles.mjs';
+import { d as prepareEnv, c as createSilgiCLI, a as prepare$2, g as generateApiFul, b as writeTypesAndFiles, w as writeCoreFile, p as prepareBuild, e as generateApp } from './writeTypesAndFiles.mjs';
 import { execSync } from 'node:child_process';
 import { readFileSync } from 'node:fs';
 import * as p from '@clack/prompts';
@@ -49,6 +49,10 @@ const run = defineCommand({
     const data = args.active ? await runCommand(prepare, {
       rawArgs: ["--commands", "run"]
     }) : void 0;
+    globalThis.__nitro__ = globalThis.__nitro__ || {};
+    globalThis.__nitro__.useRuntimeConfig = function() {
+      return data?.result?.silgi?.options?.runtimeConfig || {};
+    };
     if (!data?.result?.silgi && args.active) {
       consola.error("Silgi not found");
       return;
@@ -227,6 +231,7 @@ const prepare = defineCommand({
       activeEnvironment: args.env
     });
     await prepare$2();
+    await generateApiFul(silgi);
     await writeTypesAndFiles(silgi);
     await writeCoreFile(silgi);
     await prepareBuild(silgi);

package/dist/cli/writeTypesAndFiles.mjs

@@ -1,9 +1,10 @@
 import { genObjectFromRawEntries, genObjectFromRaw, genObjectFromValues } from 'knitwork';
 import { join, resolve, relative, dirname, basename, extname, isAbsolute } from 'pathe';
-import { writeFile, relativeWithDot, hash, resolveAlias, directoryToURL, addTemplate, hasError, parseServices, hasSilgiModule, normalizeTemplate, useLogger, resolveSilgiPath, genEnsureSafeVar, isDirectory } from 'silgi/kit';
+import { writeFile, hasSilgiModule, addTemplate, relativeWithDot, hash, resolveAlias, directoryToURL, hasError, parseServices, normalizeTemplate, useLogger, resolveSilgiPath, genEnsureSafeVar, isDirectory } from 'silgi/kit';
+import { generateDTS } from 'apiful/openapi';
+import consola$1, { consola } from 'consola';
 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, autoImportTypes } from 'silgi';
 import { runtimeDir } from 'silgi/runtime/meta';
@@ -25,7 +26,6 @@ import { parseSync } from '@oxc-parser/wasm';
 import { klona } from 'klona';
 import { useSilgiRuntimeConfig, initRuntimeConfig } from 'silgi/runtime';
 import { createStorage, builtinDrivers } from 'unstorage';
-import { generateDTS } from 'apiful/openapi';
 import { peerDependencies } from 'silgi/meta';
 import { snakeCase } from 'scule';
 import { l as loadOptions, s as silgiGenerateType } from './types.mjs';
@@ -69,6 +69,40 @@ export const routeRules = ${genObjectFromRawEntries(
   }
 }
 
+async function generateApiFul(silgi) {
+  const config = silgi.options.apiFul;
+  if (!config.services || hasSilgiModule("openapi")) {
+    config.services ??= {};
+    config.services = {
+      silgi: {
+        schema: join(silgi.options.build.dir, "openapi.json")
+      }
+    };
+  }
+  const resolvedOpenAPIServices = Object.fromEntries(
+    Object.entries(config?.services ?? {}).filter(([, service]) => Boolean(service.schema))
+  );
+  if (Object.keys(resolvedOpenAPIServices).length === 0) {
+    consola.info("No OpenAPI schemas found, skipping generation");
+    return;
+  }
+  for (const service of Object.values(resolvedOpenAPIServices)) {
+    if (typeof service.schema === "string" && !service.schema.startsWith("http")) {
+      service.schema = resolve(silgi.options.rootDir, service.schema);
+    }
+  }
+  const types = await generateDTS(resolvedOpenAPIServices);
+  silgi.hook("prepare:types", (opts) => {
+    opts.references.push({ path: "./apiful.d.ts" });
+  });
+  addTemplate({
+    filename: "types/apiful.d.ts",
+    where: ".silgi",
+    write: true,
+    getContents: () => types
+  });
+}
+
 async function prepare(_silgi) {
 }
 
@@ -845,7 +879,7 @@ class SchemaParser {
         type: "Parser",
         path
       });
-      consola.warn("This file has a problem:", path);
+      consola$1.warn("This file has a problem:", path);
     }
     const variableDeclarations = ast.program.body.filter((i) => i.type === "ExportNamedDeclaration").filter((i) => i.declaration?.type === "VariableDeclaration");
     return variableDeclarations;
@@ -859,7 +893,7 @@ class SchemaParser {
         type: "Parser",
         path
       });
-      consola.warn("This file has a problem:", path);
+      consola$1.warn("This file has a problem:", path);
     }
     const interfaceDeclarations = ast.program.body.filter((i) => i.type === "ExportNamedDeclaration").filter((i) => i.declaration?.type === "TSInterfaceDeclaration");
     return interfaceDeclarations;
@@ -982,7 +1016,7 @@ async function scanExportFile(silgi) {
       if (caseCorrected) {
         const original = relative(silgi.options.serverDir, dir);
         const corrected = relative(silgi.options.serverDir, join(dirname(dir), caseCorrected));
-        consola$1.warn(`Components not scanned from \`~/${corrected}\`. Did you mean to name the directory \`~/${original}\` instead?`);
+        consola.warn(`Components not scanned from \`~/${corrected}\`. Did you mean to name the directory \`~/${original}\` instead?`);
       }
     }
   }
@@ -1203,7 +1237,7 @@ ${injectedResult.code}`;
       console.error("Failed to read scan.ts file:", error);
     } else {
       if (error instanceof Error) {
-        consola$1.withTag("silgi").info(error.message);
+        consola.withTag("silgi").info(error.message);
       }
     }
     return {
@@ -1378,40 +1412,6 @@ async function createStorageCLI(silgi) {
   return storage;
 }
 
-async function generateApiFul(silgi) {
-  const config = silgi.options.apiFul;
-  if (!config.services || hasSilgiModule("openapi")) {
-    config.services ??= {};
-    config.services = {
-      silgi: {
-        schema: join(silgi.options.build.dir, "openapi.json")
-      }
-    };
-  }
-  const resolvedOpenAPIServices = Object.fromEntries(
-    Object.entries(config?.services ?? {}).filter(([, service]) => Boolean(service.schema))
-  );
-  if (Object.keys(resolvedOpenAPIServices).length === 0) {
-    consola$1.info("No OpenAPI schemas found, skipping generation");
-    return;
-  }
-  for (const service of Object.values(resolvedOpenAPIServices)) {
-    if (typeof service.schema === "string" && !service.schema.startsWith("http")) {
-      service.schema = resolve(silgi.options.rootDir, service.schema);
-    }
-  }
-  const types = await generateDTS(resolvedOpenAPIServices);
-  silgi.hook("prepare:types", (opts) => {
-    opts.references.push({ path: "./apiful.d.ts" });
-  });
-  addTemplate({
-    filename: "types/apiful.d.ts",
-    where: ".silgi",
-    write: true,
-    getContents: () => types
-  });
-}
-
 const vueShim = {
   filename: "delete/testtest.d.ts",
   where: ".silgi",
@@ -1681,7 +1681,7 @@ async function createSilgiCLI(config = {}, opts = {}) {
     errors: [],
     commands: {},
     _requiredModules: {},
-    logger: consola$1.withTag("silgi"),
+    logger: consola.withTag("silgi"),
     close: () => silgi.hooks.callHook("close", silgi),
     storage: void 0,
     scanModules: [],
@@ -1730,7 +1730,6 @@ async function createSilgiCLI(config = {}, opts = {}) {
   silgi.hooks.addHooks(silgi.options.hooks);
   await installModules(silgi);
   await silgi.hooks.callHook("scanFiles:done", silgi);
-  await generateApiFul(silgi);
   await commands(silgi);
   await installPackages(silgi);
   await generateApp(silgi);
@@ -2408,4 +2407,4 @@ async function writeTypesAndFiles(silgi) {
   }
 }
 
-export { prepare as a, writeTypesAndFiles as b, createSilgiCLI as c, prepareEnv as d, generateApp as g, prepareBuild as p, writeCoreFile as w };
+export { prepare as a, writeTypesAndFiles as b, createSilgiCLI as c, prepareEnv as d, generateApp as e, generateApiFul as g, prepareBuild as p, writeCoreFile as w };

package/dist/runtime/internal/config.mjs

@@ -3,27 +3,27 @@ import destr from "destr";
 import { klona } from "klona";
 import { snakeCase } from "scule";
 import { tryUseSilgi, useSilgi } from "silgi";
-let silgiRuntimeConfig = globalThis.__nitro__?.useRuntimeConfig?.() || process.env.RUNTIME_CONFIG;
+let _inlineSilgiRuntimeConfig = globalThis.__nitro__?.useRuntimeConfig?.() || process.env.RUNTIME_CONFIG;
 let envOptions = {
   prefix: "NITRO_",
-  altPrefix: silgiRuntimeConfig?.nitro?.envPrefix ?? process.env.NITRO_ENV_PREFIX ?? "_",
+  altPrefix: _inlineSilgiRuntimeConfig?.nitro?.envPrefix ?? process.env.NITRO_ENV_PREFIX ?? "_",
   silgiPrefix: "SILGI_",
-  envExpansion: silgiRuntimeConfig?.nitro.envExpansion ?? process.env.NITRO_ENV_EXPANSION ?? false
+  envExpansion: _inlineSilgiRuntimeConfig?.nitro?.envExpansion ?? process.env.NITRO_ENV_EXPANSION ?? false
 };
 let _sharedRuntimeConfig = _deepFreeze(
-  applyEnv(klona(silgiRuntimeConfig ?? {}), envOptions)
+  applyEnv(klona(_inlineSilgiRuntimeConfig ?? {}), envOptions)
 );
 export function useSilgiRuntimeConfig(event, inlineRuntimeConfig = {}) {
-  if (!silgiRuntimeConfig) {
-    silgiRuntimeConfig = globalThis.__nitro__?.useRuntimeConfig?.();
+  if (!_inlineSilgiRuntimeConfig) {
+    _inlineSilgiRuntimeConfig = globalThis.__nitro__?.useRuntimeConfig?.();
     envOptions = {
       prefix: "NITRO_",
-      altPrefix: silgiRuntimeConfig?.nitro?.envPrefix ?? process.env.NITRO_ENV_PREFIX ?? "_",
+      altPrefix: _inlineSilgiRuntimeConfig?.nitro?.envPrefix ?? process.env.NITRO_ENV_PREFIX ?? "_",
       silgiPrefix: "SILGI_",
-      envExpansion: silgiRuntimeConfig?.nitro.envExpansion ?? process.env.NITRO_ENV_EXPANSION ?? false
+      envExpansion: _inlineSilgiRuntimeConfig?.nitro.envExpansion ?? process.env.NITRO_ENV_EXPANSION ?? false
     };
     _sharedRuntimeConfig = _deepFreeze(
-      applyEnv(klona(silgiRuntimeConfig ?? {}), envOptions)
+      applyEnv(klona(_inlineSilgiRuntimeConfig ?? {}), envOptions)
     );
   }
   const silgi = tryUseSilgi();
@@ -34,23 +34,23 @@ export function useSilgiRuntimeConfig(event, inlineRuntimeConfig = {}) {
         return inlineRuntimeConfig;
       }
     }
-    if (!silgiRuntimeConfig) {
+    if (!_inlineSilgiRuntimeConfig) {
       _sharedRuntimeConfig = initRuntimeConfig(envOptions, inlineRuntimeConfig);
     }
     if (!event) {
       return _sharedRuntimeConfig;
     }
-    const runtimeConfig2 = klona(silgiRuntimeConfig);
+    const runtimeConfig2 = klona(_inlineSilgiRuntimeConfig);
     applyEnv(runtimeConfig2, envOptions);
     return runtimeConfig2;
   }
-  if (!silgiRuntimeConfig) {
+  if (!_inlineSilgiRuntimeConfig) {
     _sharedRuntimeConfig = initRuntimeConfig(envOptions, inlineRuntimeConfig);
   }
   if (!event) {
     return _sharedRuntimeConfig;
   }
-  const runtimeConfig = klona(silgiRuntimeConfig);
+  const runtimeConfig = klona(_inlineSilgiRuntimeConfig);
   applyEnv(runtimeConfig, envOptions);
   return runtimeConfig;
 }

package/package.json

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