silgi 0.20.36 → 0.20.38

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.20.36";
+const version = "0.20.38";
 const peerDependencies = {
 	"@fastify/deepmerge": "^3.0.0",
 	"@nuxt/kit": "^3.15.3",

package/dist/_chunks/{routeRules.mjs → silgiApp.mjs}

@@ -1,4 +1,6 @@
 import { withoutTrailingSlash, withLeadingSlash } from 'ufo';
+import consola from 'consola';
+import { createContext } from 'unctx';
 
 function patternToRegex(pattern) {
   let regexStr = pattern.replace(/[.+?^${}()|[\]\\]/g, "\\$&");
@@ -285,4 +287,25 @@ function createRouteRules() {
   };
 }
 
-export { createRouteRules as c };
+const silgiCLICtx = createContext();
+function useSilgiCLI() {
+  const instance = silgiCLICtx.tryUse();
+  if (!instance) {
+    throw new Error("Silgi instance is unavailable!");
+  }
+  return instance;
+}
+async function silgiCLIIClose() {
+  const silgi = silgiCLICtx.tryUse();
+  if (!silgi) {
+    return;
+  }
+  await silgi.close();
+  await silgi.callHook("close", silgi);
+  consola.withTag("silgi").success("Process terminated");
+}
+function tryUseSilgiCLI() {
+  return silgiCLICtx.tryUse();
+}
+
+export { silgiCLICtx as a, createRouteRules as c, silgiCLIIClose as s, tryUseSilgiCLI as t, useSilgiCLI as u };

package/dist/cli/dev.mjs

@@ -1,12 +1,14 @@
+import { basename } from 'node:path';
 import { watch } from 'chokidar';
 import { defineCommand, runCommand } from 'citty';
 import consola from 'consola';
 import { useSilgiCLI } from 'silgi/core';
 import { version } from 'silgi/meta';
-import { basename } from 'pathe';
-import { h as hasError } from './compatibility.mjs';
-import { s as scanFiles, w as writeScanFiles, g as generateApp, c as commonArgs, p as prepare } from './prepare.mjs';
-import 'semver/functions/satisfies.js';
+import { s as silgiCLIIClose } from '../_chunks/silgiApp.mjs';
+import { c as commonArgs, p as prepare } from './prepare.mjs';
+import 'ufo';
+import 'unctx';
+import 'pathe';
 import 'silgi/kit';
 import 'node:fs';
 import 'node:fs/promises';
@@ -14,12 +16,12 @@ import 'hookable';
 import 'silgi/runtime/meta';
 import 'silgi/types';
 import 'unimport';
-import '../_chunks/routeRules.mjs';
-import 'ufo';
 import '@clack/prompts';
 import 'dotenv';
 import 'mlly';
 import 'dev-jiti';
+import './compatibility.mjs';
+import 'semver/functions/satisfies.js';
 import 'node:url';
 import 'defu';
 import 'exsolve';
@@ -41,19 +43,9 @@ import 'pathe/utils';
 import 'node:child_process';
 import 'picocolors';
 
-async function reloadScan(silgi, path, _stats) {
-  const startTime = performance.now();
-  silgi.errors = [];
+async function reloadScan(path, _stats) {
+  const silgi = useSilgiCLI();
   await silgi.callHook("reload:scan", path, _stats);
-  await scanFiles(silgi, silgi.options.devServer.watch);
-  if (!hasError("Parser", silgi)) {
-    await writeScanFiles(silgi);
-  }
-  await generateApp(silgi);
-  silgi.errors = [];
-  const endTime = performance.now();
-  const elapsedTime = Math.round(endTime - startTime);
-  silgi.logger.success(`${basename(path)} - ${elapsedTime}ms`);
 }
 
 const dev = defineCommand({
@@ -73,7 +65,7 @@ const dev = defineCommand({
       description: "Run in silgi development mode"
     }
   },
-  async run({ args }) {
+  async run() {
     await runCommand(prepare, {
       rawArgs: ["--commands", "run"]
     });
@@ -81,30 +73,34 @@ const dev = defineCommand({
     let watcher;
     if (silgi.options.devServer.watch.length > 0) {
       watcher = watch(silgi.options.devServer.watch, silgi.options.watchOptions);
-      watcher.on("add", async (...data) => async () => {
+      watcher.on("add", async (path, stats) => {
+        const startTime = performance.now();
+        await reloadScan(path, stats);
         await runCommand(prepare, {
           rawArgs: ["--commands", "run"]
         });
-        await reloadScan(silgi, ...data);
-      }).on("change", async (...data) => async () => {
+        silgi.errors = [];
+        const endTime = performance.now();
+        const elapsedTime = Math.round(endTime - startTime);
+        silgi.logger.success(`${basename(path)} - ${elapsedTime}ms`);
+      }).on("change", async (path, stats) => {
+        const startTime = performance.now();
+        await reloadScan(path, stats);
         await runCommand(prepare, {
           rawArgs: ["--commands", "run"]
         });
-        await reloadScan(silgi, ...data);
+        silgi.errors = [];
+        const endTime = performance.now();
+        const elapsedTime = Math.round(endTime - startTime);
+        silgi.logger.success(`${basename(path)} - ${elapsedTime}ms`);
       });
     }
-    const close = async () => {
-      await silgi.close();
+    process.on("SIGINT", async () => {
+      consola.withTag("silgi").info("Shutting down...");
       if (watcher) {
         watcher.close();
       }
-      await silgi.callHook("close", silgi);
-      consola.withTag("silgi").success("Process terminated");
-    };
-    process.on("SIGINT", async () => {
-      consola.withTag("silgi").info("Shutting down...");
-      await close();
-      await silgi.callHook("close", silgi);
+      await silgiCLIIClose();
       process.exit(0);
     });
     consola.withTag("silgi").success("Prepare completed");

package/dist/cli/install.mjs

@@ -13,8 +13,9 @@ import 'silgi/core';
 import 'silgi/runtime/meta';
 import 'silgi/types';
 import 'unimport';
-import '../_chunks/routeRules.mjs';
+import '../_chunks/silgiApp.mjs';
 import 'ufo';
+import 'unctx';
 import '@clack/prompts';
 import 'dotenv';
 import 'mlly';

package/dist/cli/prepare.mjs

@@ -1,16 +1,16 @@
 import { defineCommand, runCommand } from 'citty';
-import consola$1, { consola } from 'consola';
 import { join, resolve, relative, dirname, basename, extname, isAbsolute } from 'pathe';
 import { peerDependencies, version } from 'silgi/meta';
 import { writeFile, relativeWithDot, hash, resolveAlias, directoryToURL, addTemplate, parseServices, normalizeTemplate, useLogger, initRuntimeConfig, hasError as hasError$1, resolveSilgiPath, isDirectory } from 'silgi/kit';
 import { existsSync, promises, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
 import { readdir, readFile } from 'node:fs/promises';
+import consola$1, { consola } from 'consola';
 import { createHooks, createDebugger } from 'hookable';
 import { useSilgiCLI, silgiCLICtx } from 'silgi/core';
 import { runtimeDir } from 'silgi/runtime/meta';
 import { autoImportTypes } from 'silgi/types';
 import { scanExports, createUnimport, toExports } from 'unimport';
-import { c as createRouteRules } from '../_chunks/routeRules.mjs';
+import { c as createRouteRules, s as silgiCLIIClose } from '../_chunks/silgiApp.mjs';
 import * as p from '@clack/prompts';
 import * as dotenv from 'dotenv';
 import { resolveModuleExportNames, findTypeExports, findExports, resolvePath, parseNodeModulePath, lookupNodeModuleSubpath } from 'mlly';
@@ -1290,11 +1290,10 @@ class SchemaParser {
 }
 
 async function scanFiles$1(silgi, watchFiles) {
-  const isWatch = watchFiles && watchFiles.length > 0;
   const filePaths = /* @__PURE__ */ new Set();
   const scannedPaths = [];
   const dir = silgi.options.serverDir;
-  const files = isWatch ? watchFiles : (await globby(dir, { cwd: silgi.options.rootDir, ignore: silgi.options.ignore })).sort();
+  const files = (await globby(dir, { cwd: silgi.options.rootDir, ignore: silgi.options.ignore })).sort();
   if (files.length) {
     const siblings = await readdir(dirname(dir)).catch(() => []);
     const directory = basename(dir);
@@ -2475,16 +2474,7 @@ const run = defineCommand({
       consola.error("Silgi not found");
       return;
     }
-    const silgi = globalThis.__silgi_temp_obj;
-    if (silgi) {
-      if (silgiCLICtx.tryUse()) {
-        silgiCLICtx.unset();
-        silgiCLICtx.set(silgi);
-      } else {
-        silgiCLICtx.set(silgi);
-        silgi.hook("close", () => silgiCLICtx.unset());
-      }
-    }
+    const silgi = useSilgiCLI();
     const tags = args.tag?.split(",").map((t) => t.trim());
     p.intro(color.bold(`Silgi CLI ${color.green(`v${version}`)}`));
     const silgiConfig = await loadOptions({});
@@ -2599,18 +2589,6 @@ const run = defineCommand({
         });
         let cleanHandler = cmd.handler.handler.replace(/\n/g, "");
         cleanHandler = `import { silgiCLICtx } from 'silgi/core' 
-
-      // Access from global scope
-      const silgiObj = globalThis.__silgi_temp_obj;
-      if (silgiCLICtx.tryUse()) {
-        silgiCLICtx.unset()
-        silgiCLICtx.set(silgiObj)
-      }
-      else {
-        silgiCLICtx.set(silgiObj)
-        // Use the silgiObj directly
-        silgiObj.hook && silgiObj.hook('close', () => silgiCLICtx.unset())
-      }
         ${cleanHandler}
 `;
         await jiti.evalModule(cleanHandler, {
@@ -2621,6 +2599,7 @@ const run = defineCommand({
         });
       }
     }
+    await silgiCLIIClose();
   }
 });
 
@@ -2669,14 +2648,6 @@ const prepare = defineCommand({
     await writeCoreFile(silgi);
     await prepareBuild(silgi);
     if (!args.commands) {
-      const close = async () => {
-        await silgi.close();
-        await silgi.callHook("close", silgi);
-        consola$1.withTag("silgi").success("Process terminated");
-      };
-      await silgi.callHook("close", silgi);
-      consola$1.withTag("silgi").success("Prepare completed");
-      await close();
       await runCommand(run, {
         rawArgs: ["--tag", "init", "--active", "false"]
       });
@@ -2692,4 +2663,4 @@ const prepare$1 = {
   default: prepare
 };
 
-export { prepare$1 as a, commonArgs as c, generateApp as g, prepare as p, run$1 as r, scanFiles$1 as s, writeScanFiles as w };
+export { prepare$1 as a, commonArgs as c, prepare as p, run$1 as r };

package/dist/core/index.mjs

@@ -1,8 +1,9 @@
 import { createConsola } from 'consola';
 import defu, { defu as defu$1 } from 'defu';
 import { createHooks } from 'hookable';
-import { c as createRouteRules } from '../_chunks/routeRules.mjs';
-import { getContext, createContext } from 'unctx';
+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 { createStorage as createStorage$1, builtinDrivers, prefixStorage } from 'unstorage';
@@ -716,18 +717,6 @@ function createShared(shared) {
   return shared;
 }
 
-const silgiCLICtx = createContext();
-function useSilgiCLI() {
-  const instance = silgiCLICtx.tryUse();
-  if (!instance) {
-    throw new Error("Silgi instance is unavailable!");
-  }
-  return instance;
-}
-function tryUseSilgiCLI() {
-  return silgiCLICtx.tryUse();
-}
-
 function storageMount(silgi) {
   const _silgi = silgi || useSilgi();
   return (base, driver) => {
@@ -740,4 +729,4 @@ function storageMount(silgi) {
   };
 }
 
-export { ErrorCategory, ErrorFactory, ErrorSeverity, HttpStatus, SilgiError, createSchema, createService, createShared, createSilgi, createStorage, getEvent, getEventContext, isBaseError, mergeSchemas, mergeServices, mergeShared, parseURI, silgi, silgiCLICtx, silgiCtx, storageMount, tryUseSilgi, tryUseSilgiCLI, useSilgi, useSilgiCLI, useSilgiStorage };
+export { ErrorCategory, ErrorFactory, ErrorSeverity, HttpStatus, SilgiError, createSchema, createService, createShared, createSilgi, createStorage, getEvent, getEventContext, isBaseError, mergeSchemas, mergeServices, mergeShared, parseURI, silgi, silgiCtx, storageMount, tryUseSilgi, useSilgi, useSilgiStorage };

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.20.36";
+const version = "0.20.38";
 const peerDependencies = {
 	"@fastify/deepmerge": "^3.0.0",
 	"@nuxt/kit": "^3.15.3",

package/dist/meta/index.d.ts

@@ -1,4 +1,4 @@
-const version = "0.20.36";
+const version = "0.20.38";
 const peerDependencies = {
 	"@fastify/deepmerge": "^3.0.0",
 	"@nuxt/kit": "^3.15.3",

package/package.json

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