silgi 0.37.40 → 0.37.42

package/dist/build.mjs

@@ -32,7 +32,7 @@ import 'ignore';
 import 'klona';
 import 'unstorage';
 import 'scule';
-import './cli/types.mjs';
+import './cli/loader.mjs';
 import 'c12';
 import 'compatx';
 import 'klona/full';
@@ -43,3 +43,4 @@ import 'pkg-types';
 import 'apiful/openapi';
 import 'pathe/utils';
 import 'untyped';
+import './cli/types.mjs';

package/dist/cli/build.mjs

@@ -24,11 +24,12 @@ import ignore from 'ignore';
 import { klona } from 'klona';
 import { createStorage, builtinDrivers } from 'unstorage';
 import { snakeCase } from 'scule';
-import { l as loadOptions, s as silgiGenerateType } from './types.mjs';
+import { l as loadOptions } from './loader.mjs';
 import { generateDTS } from 'apiful/openapi';
 import { u as useSilgiCLI$1 } from '../_chunks/silgiApp.mjs';
 import { resolveAlias as resolveAlias$1 } from 'pathe/utils';
 import { generateTypes, resolveSchema } from 'untyped';
+import { s as silgiGenerateType } from './types.mjs';
 
 async function setupDotenv(options) {
   const targetEnvironment = options.env ?? process.env;
@@ -330,7 +331,8 @@ async function registerModuleExportScan(silgi) {
       if (!module.entryPath) {
         continue;
       }
-      const moduleTypes = await promises.readFile(module.entryPath.replace(/\.mjs$/, "moduleTypes.d.mts"), "utf8").catch(() => "");
+      const path = module.meta._packageName ? module.entryPath.replace(/\.mjs$/, "Types.d.mts") : module.entryPath;
+      const moduleTypes = await promises.readFile(path, "utf8").catch(() => "");
       const normalisedModuleTypes = moduleTypes.replace(/export\s*\{.*?\}/gs, (match) => match.replace(/\b(type|interface)\b/g, ""));
       for (const e of findTypeExports(normalisedModuleTypes)) {
         moduleReExports.push(e);
@@ -1433,10 +1435,9 @@ async function createSilgiCLI(config = {}, opts = {}) {
     callHook: hooks.callHook,
     addHooks: hooks.addHooks,
     hook: hooks.hook,
-    async updateConfig(_config) {
-    },
     adapters: {},
-    useLocalConfig: () => useRuntimeConfig(void 0, options.runtimeConfig, true)
+    useLocalConfig: () => useRuntimeConfig(void 0, options.runtimeConfig, true),
+    meta: {}
   };
   sharedRuntimeConfig(silgi.options.runtimeConfig);
   if (silgiCLICtx.tryUse()) {
@@ -1685,10 +1686,10 @@ async function prepareCoreFile(silgi) {
         ]
       },
       {
-        specifier: "./rules",
+        specifier: "./meta",
         imports: [
           {
-            name: "routeRules"
+            name: "meta"
           }
         ]
       }
@@ -1772,7 +1773,7 @@ async function prepareCoreFile(silgi) {
     "",
     " options: mergeDeep(cliConfigs, {",
     "   runtimeConfig: {} as SilgiRuntimeOptions,",
-    "   routeRules: routeRules as any,",
+    "   meta: meta,",
     `   present: '${silgi.options.preset}',`,
     "   ...option?.modules,",
     "   ...option?.options,",
@@ -1805,6 +1806,10 @@ async function writeCoreFile(silgi) {
     path: join(silgiDir, "configs.ts"),
     contents: configs.join("\n")
   });
+  buildFiles.push({
+    path: join(silgiDir, "meta.ts"),
+    contents: `export const meta = ${JSON.stringify(silgi.meta, null, 2)}`
+  });
   for await (const file of buildFiles) {
     if (!silgi.errors.length) {
       await writeFile(

package/dist/cli/common.mjs

@@ -0,0 +1,13 @@
+const commonArgs = {
+  dir: {
+    type: "string",
+    description: "project root directory"
+  },
+  _dir: {
+    type: "positional",
+    default: ".",
+    description: "project root directory (prefer using `--dir`)"
+  }
+};
+
+export { commonArgs as c };

package/dist/cli/config/index.mjs

@@ -1,4 +1,5 @@
-export { l as loadOptions, s as silgiGenerateType } from '../types.mjs';
+export { l as loadOptions } from '../loader.mjs';
+export { s as silgiGenerateType } from '../types.mjs';
 import 'c12';
 import 'compatx';
 import 'klona/full';

package/dist/cli/dev.mjs

@@ -37,7 +37,7 @@ async function watchDev() {
       `!${join(silgi.options.silgi.serverDir, "config")}`,
       `${join(silgi.options.silgi.serverDir, "permission.ts")}`,
       `${join(silgi.options.silgi.serverDir, "core.ts")}`,
-      `${join(silgi.options.silgi.serverDir, "rules.ts")}`,
+      `${join(silgi.options.silgi.serverDir, "meta.ts")}`,
       `${join(silgi.options.silgi.serverDir, "configs.ts")}`,
       `${join(silgi.options.silgi.serverDir, "vfs")}`,
       `${join(silgi.options.silgi.serverDir, "scan.ts")}`

package/dist/cli/index.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { defineCommand, runMain } from 'citty';
 
-const version = "0.37.40";
+const version = "0.37.42";
 const packageJson = {
 	version: version};
 
@@ -22,7 +22,8 @@ const main = defineCommand({
     init: () => import('./init.mjs').then((m) => m.default),
     run: () => import('./prepare.mjs').then(function (n) { return n.r; }).then((m) => m.default),
     install: () => import('./install.mjs').then((m) => m.default),
-    watch: () => import('./watch.mjs').then((m) => m.default)
+    watch: () => import('./watch.mjs').then((m) => m.default),
+    reset: () => import('./reset.mjs').then((m) => m.default)
   },
   run() {
   }

package/dist/cli/init.mjs

@@ -29,7 +29,7 @@ import 'ignore';
 import 'klona';
 import 'unstorage';
 import 'scule';
-import './types.mjs';
+import './loader.mjs';
 import 'c12';
 import 'compatx';
 import 'klona/full';
@@ -42,6 +42,8 @@ import '../_chunks/silgiApp.mjs';
 import 'unctx';
 import 'pathe/utils';
 import 'untyped';
+import './types.mjs';
+import './common.mjs';
 import 'node:child_process';
 
 const command = defineCommand({
@@ -81,7 +83,9 @@ const command = defineCommand({
         "export default defineNitroPlugin(async (nitro) => {",
         "",
         "  await buildSilgi({",
-        "    framework: nitro,",
+        "    framework: {,",
+        "      nitro,",
+        "    },",
         "    options: {",
         "      putStorage: useStorage(),",
         "      runtimeConfig: useRuntimeConfig(),",

package/dist/cli/install.mjs

@@ -4,7 +4,8 @@ import { consola } from 'consola';
 import { version } from 'silgi/meta';
 import { addNPMPackage, addTemplate } from 'silgi/kit';
 import { u as useSilgiCLI } from '../_chunks/silgiApp.mjs';
-import { b as commonArgs, a as command$1 } from './prepare.mjs';
+import { c as commonArgs } from './common.mjs';
+import { a as command$1 } from './prepare.mjs';
 import 'unctx';
 import 'pathe';
 import './build.mjs';
@@ -32,7 +33,7 @@ import 'ignore';
 import 'klona';
 import 'unstorage';
 import 'scule';
-import './types.mjs';
+import './loader.mjs';
 import 'c12';
 import 'compatx';
 import 'klona/full';
@@ -43,6 +44,7 @@ import 'pkg-types';
 import 'apiful/openapi';
 import 'pathe/utils';
 import 'untyped';
+import './types.mjs';
 
 async function installPackages(silgi = useSilgiCLI()) {
   await addNPMPackage([