silgi 0.29.27 → 0.29.29

package/dist/build.mjs

@@ -6,6 +6,8 @@ import 'silgi/kit';
 import 'node:fs';
 import 'node:fs/promises';
 import 'knitwork';
+import './_chunks/silgiApp.mjs';
+import 'unctx';
 import 'mlly';
 import 'pathe/utils';
 import 'silgi/runtime/meta';

package/dist/cli/index.mjs

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

package/dist/cli/init.mjs

@@ -10,6 +10,8 @@ import 'silgi/meta';
 import './silgi.mjs';
 import 'apiful/openapi';
 import 'knitwork';
+import '../_chunks/silgiApp.mjs';
+import 'unctx';
 import 'mlly';
 import 'pathe/utils';
 import 'silgi/runtime/meta';
@@ -42,8 +44,6 @@ import 'silgi/runtime';
 import 'unstorage';
 import 'scule';
 import 'node:child_process';
-import '../_chunks/silgiApp.mjs';
-import 'unctx';
 
 const command = defineCommand({
   meta: {

package/dist/cli/install.mjs

@@ -116,7 +116,7 @@ const command = defineCommand({
       return;
     }
     const cleanPackageName = (name, version) => {
-      const cleanVersion = version.replace(/^[>=]+\s*/, "^");
+      const cleanVersion = version.replace(/^(>=|<=|>|<)/, "^");
       return `${name}@${cleanVersion}`;
     };
     const deps = Object.entries(packages.dependencies || {}).map(([name, version]) => cleanPackageName(name, version)).join(" ");

package/dist/cli/prepare.mjs

@@ -7,10 +7,8 @@ import * as p from '@clack/prompts';
 import { isCancel, cancel } from '@clack/prompts';
 import { consola } from 'consola';
 import { createJiti } from 'dev-jiti';
-import { useSilgiCLI as useSilgiCLI$1 } from 'silgi';
-import { u as useSilgiCLI, a as silgiCLIIClose } from '../_chunks/silgiApp.mjs';
-import { addTemplate } from 'silgi/kit';
-import { generateTypes, resolveSchema } from 'untyped';
+import { useSilgiCLI } from 'silgi';
+import { a as silgiCLIIClose } from '../_chunks/silgiApp.mjs';
 import { l as loadOptions } from './types.mjs';
 
 const commonArgs = {
@@ -25,62 +23,6 @@ const commonArgs = {
   }
 };
 
-function debugMode(name) {
-  const silgi = useSilgiCLI();
-  if (silgi.options.debug === true || typeof silgi.options.debug === "object" && silgi.options.debug[name]) {
-    return true;
-  }
-  return false;
-}
-
-async function scanCommands(silgi = useSilgiCLI()) {
-  const commands = [];
-  await silgi.callHook("prepare:commands", commands);
-  if (debugMode("command")) {
-    addTemplate({
-      filename: "cli.json",
-      where: ".silgi",
-      write: true,
-      getContents: () => JSON.stringify(commands, null, 2)
-    });
-  }
-  silgi.hook("before:schema.ts", async () => {
-    const allTags = commands.reduce((acc, commandGroup) => {
-      Object.values(commandGroup).forEach((command) => {
-        if (command.tags) {
-          command.tags.forEach((tag) => acc.add(tag));
-        }
-      });
-      return acc;
-    }, /* @__PURE__ */ new Set());
-    const data = [
-      "",
-      generateTypes(
-        await resolveSchema(
-          {
-            ...Object.fromEntries(Array.from(allTags.values()).map((tag) => [tag, "string"]))
-          }
-        ),
-        {
-          interfaceName: "SilgiCommandsExtended",
-          addExport: false,
-          addDefaults: false,
-          allowExtraKeys: false,
-          indentation: 0
-        }
-      ),
-      ""
-    ];
-    addTemplate({
-      filename: "types/commands.d.ts",
-      write: true,
-      where: ".silgi",
-      getContents: () => data.join("\n")
-    });
-  });
-  return commands;
-}
-
 function cancelOnCancel({
   value,
   message = "Cancelled",
@@ -123,11 +65,11 @@ const command$1 = defineCommand({
         rawArgs: ["--commandType", "run"]
       });
     }
-    const silgi = useSilgiCLI$1();
+    const silgi = useSilgiCLI();
     if (!silgi) {
       throw new Error("Silgi is not initialized");
     }
-    const commands = await scanCommands();
+    const commands = silgi.options.commands;
     globalThis.__nitro__ = globalThis.__nitro__ || {};
     globalThis.__nitro__.useRuntimeConfig = function() {
       return silgi?.options?.runtimeConfig || {};

package/dist/cli/silgi.mjs

@@ -4,7 +4,8 @@ import { join, resolve, dirname, relative, isAbsolute, basename, extname } from
 import { hasSilgiModule, addTemplate, normalizeTemplate, useLogger, genEnsureSafeVar, baseHeaderBannerComment, addImports, hash, toArray, writeFile, relativeWithDot, isDirectory, isPresents, addCoreFile, resolveAlias as resolveAlias$1, directoryToURL, hasError, parseServices, resolveSilgiPath } from 'silgi/kit';
 import { mkdirSync, existsSync, writeFileSync, promises, readFileSync } from 'node:fs';
 import { readdir, readFile } from 'node:fs/promises';
-import { genObjectFromRawEntries, genImport, genTypeImport, genObjectFromRaw, genObjectFromValues } from 'knitwork';
+import { genAugmentation, genObjectFromRawEntries, genImport, genTypeImport, genObjectFromRaw, genObjectFromValues } from 'knitwork';
+import { u as useSilgiCLI } from '../_chunks/silgiApp.mjs';
 import { resolvePath, parseNodeModulePath, lookupNodeModuleSubpath, resolveModuleExportNames, findTypeExports, findExports } from 'mlly';
 import { resolveAlias } from 'pathe/utils';
 import { runtimeDir } from 'silgi/runtime/meta';
@@ -12,7 +13,7 @@ import { toExports, scanExports, createUnimport } from 'unimport';
 import { generateTypes, resolveSchema } from 'untyped';
 import { s as silgiGenerateType, l as loadOptions } from './types.mjs';
 import { createHooks, createDebugger } from 'hookable';
-import { useSilgiCLI, replaceRuntimeValues, silgiCLICtx, autoImportTypes } from 'silgi';
+import { useSilgiCLI as useSilgiCLI$1, replaceRuntimeValues, silgiCLICtx, autoImportTypes } from 'silgi';
 import { c as createRouteRules } from '../_chunks/routeRules.mjs';
 import * as p from '@clack/prompts';
 import * as dotenv from 'dotenv';
@@ -192,6 +193,55 @@ async function compileTemplate(template, ctx) {
 async function prepare(_silgi) {
 }
 
+function debugMode(name) {
+  const silgi = useSilgiCLI();
+  if (silgi.options.debug === true || typeof silgi.options.debug === "object" && silgi.options.debug[name]) {
+    return true;
+  }
+  return false;
+}
+
+async function prepareCommands(silgi = useSilgiCLI()) {
+  const commands = [];
+  await silgi.callHook("prepare:commands", commands);
+  if (debugMode("command")) {
+    addTemplate({
+      filename: "cli.json",
+      where: ".silgi",
+      write: true,
+      getContents: () => JSON.stringify(commands, null, 2)
+    });
+  }
+  silgi.hook("prepare:types", async ({ references }) => {
+    const allTags = commands.reduce((acc, commandGroup) => {
+      Object.values(commandGroup).forEach((command) => {
+        if (command.tags) {
+          command.tags.forEach((tag) => acc.add(tag));
+        }
+      });
+      return acc;
+    }, /* @__PURE__ */ new Set());
+    const data = [
+      genAugmentation("silgi/types", {
+        SilgiCommands: {
+          ...Object.fromEntries(Array.from(allTags.values()).map((tag) => [tag, "string"]))
+        }
+      }),
+      ""
+    ];
+    addTemplate({
+      filename: "types/commands.d.ts",
+      write: true,
+      where: ".silgi",
+      getContents: () => data.join("\n")
+    });
+    references.push({
+      path: "./commands.d.ts"
+    });
+  });
+  silgi.options.commands = commands;
+}
+
 async function prepareConfigs(silgi) {
   const _data = {
     runtimeConfig: {}
@@ -539,7 +589,6 @@ async function prepareSchema(silgi) {
     routeRulesConfig: []
   };
   await silgi.callHook("before:schema.ts", data);
-  relativeWithDot(silgi.options.build.typesDir, `${silgi.options.silgi.serverDir}/core`);
   const silgiScanTS = relativeWithDot(silgi.options.build.typesDir, `${silgi.options.silgi.serverDir}/scan`);
   let addSilgiContext = false;
   const importsContent = [
@@ -638,27 +687,25 @@ async function prepareSchema(silgi) {
     "",
     `type SilgiRuntimeHooksExtends = ${data.runtimeHooks?.length ? data.runtimeHooks.map(({ value }) => `${value}`).join(" & ") : "{}"}`,
     "",
-    "declare module 'silgi/types' {",
-    " interface FrameworkContext extends FrameworkContextExtends {}",
-    " interface SilgiSchema extends SchemaExtends {}",
-    " interface SilgiNamespaces extends InferredNamespaces {}",
-    " interface SilgiStorageBase extends SilgiStorageBaseExtends {}",
-    " interface SilgiURIs extends SilgiURIsMerge {}",
-    " interface SilgiRuntimeContext extends SilgiModuleContextExtends {}",
-    " interface SilgiEvents extends SilgiModuleEventsExtends {}",
-    " interface SilgiRuntimeSharedsExtend extends SilgiModuleSharedExtends {}",
-    " interface SilgiRuntimeActions extends RuntimeActionExtends {}",
-    " interface SilgiModuleOptions extends SilgiModuleOptionExtend {}",
-    " interface SilgiRuntimeOptions extends SilgiRuntimeOptionExtends {}",
-    " interface SilgiRuntimeHooks extends SilgiRuntimeHooksExtends {}",
-    " interface SilgiRuntimeConfig extends SilgiRuntimeConfigExtends {}",
-    " interface SilgiHooks extends ModuleHooksExtend {}",
-    " interface SilgiRuntimeMethods extends RuntimeMethodExtends {}",
-    " interface SilgiRuntimeRouteRules extends RuntimeRouteRulesExtends {}",
-    " interface SilgiRuntimeRouteRulesConfig extends RuntimeRouteRulesConfigExtends {}",
-    " interface SilgiCommands extends SilgiCommandsExtended {}",
-    "",
-    "}",
+    genAugmentation("silgi/types", {
+      FrameworkContext: [{}, { extends: ["FrameworkContextExtends"] }],
+      SilgiSchema: [{}, { extends: ["SchemaExtends"] }],
+      SilgiNamespaces: [{}, { extends: ["InferredNamespaces"] }],
+      SilgiStorageBase: [{}, { extends: ["SilgiStorageBaseExtends"] }],
+      SilgiURIs: [{}, { extends: ["SilgiURIsMerge"] }],
+      SilgiRuntimeContext: [{}, { extends: ["SilgiModuleContextExtends"] }],
+      SilgiEvents: [{}, { extends: ["SilgiModuleEventsExtends"] }],
+      SilgiRuntimeSharedsExtend: [{}, { extends: ["SilgiModuleSharedExtends"] }],
+      SilgiRuntimeActions: [{}, { extends: ["RuntimeActionExtends"] }],
+      SilgiRuntimeOptions: [{}, { extends: ["SilgiRuntimeOptionExtends"] }],
+      SilgiRuntimeHooks: [{}, { extends: ["SilgiRuntimeHooksExtends"] }],
+      SilgiRuntimeConfig: [{}, { extends: ["SilgiRuntimeConfigExtends"] }],
+      SilgiHooks: [{}, { extends: ["ModuleHooksExtend"] }],
+      SilgiRuntimeMethods: [{}, { extends: ["RuntimeMethodExtends"] }],
+      SilgiRuntimeRouteRules: [{}, { extends: ["RuntimeRouteRulesExtends"] }],
+      SilgiRuntimeRouteRulesConfig: [{}, { extends: ["RuntimeRouteRulesConfigExtends"] }],
+      SilgiModuleOptions: [{}, { extends: ["SilgiModuleOptionExtend"] }]
+    }).replace(/,\s*/g, "\n"),
     "",
     "export {}"
   ];
@@ -798,6 +845,7 @@ export const routeRules = ${genObjectFromRawEntries(
 async function build(silgi) {
   await prepare();
   await generateApiFul(silgi);
+  await prepareCommands(silgi);
   await writeCoreFile(silgi);
   await prepareBuild(silgi);
   await writeTypesAndFiles(silgi);
@@ -1263,7 +1311,7 @@ async function installModules(silgi, prepare = false) {
   }
   silgi.options.isPreparingModules = false;
 }
-async function installModule(moduleToInstall, silgi = useSilgiCLI(), inlineOptions, prepare = false) {
+async function installModule(moduleToInstall, silgi = useSilgiCLI$1(), inlineOptions, prepare = false) {
   const { silgiModule } = await loadSilgiModuleInstance(moduleToInstall);
   const res = await silgiModule(inlineOptions || {}, silgi) ?? {};
   if (res === false) {
@@ -1568,7 +1616,7 @@ class SchemaParser {
     };
   }
   parseVariableDeclaration(ast, path) {
-    const silgi = useSilgiCLI();
+    const silgi = useSilgiCLI$1();
     if (ast.program.body.length === 0) {
       if (safeFiles.find((i) => path.includes(i)))
         return [];
@@ -1582,7 +1630,7 @@ class SchemaParser {
     return variableDeclarations;
   }
   parseTSInterfaceDeclaration(ast, path = "") {
-    const silgi = useSilgiCLI();
+    const silgi = useSilgiCLI$1();
     if (ast.program.body.length === 0) {
       if (safeFiles.find((i) => path.includes(i)))
         return [];

package/dist/cli/types.mjs

@@ -23,6 +23,7 @@ const SilgiCLIDefaults = {
   appConfig: {},
   appConfigFiles: [],
   commandType: "prepare",
+  commands: [],
   runtimeConfig: {
     silgi: {
       version: "0.0.1"

package/dist/kit/index.mjs

@@ -113,7 +113,20 @@ function addImports(data) {
         const index = genTypeImports.findIndex((i) => i.specifier === item.specifier);
         if (Array.isArray(genTypeImports[index].imports)) {
           genTypeImports[index].imports ??= [];
-          genTypeImports[index].imports.push(...toArray$1(item.imports));
+          const newImports = toArray$1(item.imports);
+          for (const newImport of newImports) {
+            const isDuplicate = genTypeImports[index].imports.some((existingImport) => {
+              if (typeof existingImport === "string" && typeof newImport === "string") {
+                return existingImport === newImport;
+              } else if (typeof existingImport === "object" && typeof newImport === "object") {
+                return existingImport.name === newImport.name && existingImport.as === newImport.as;
+              }
+              return false;
+            });
+            if (!isDuplicate) {
+              genTypeImports[index].imports.push(newImport);
+            }
+          }
         } else {
           genTypeImports[index].imports = item.imports;
         }

package/dist/types/index.d.mts

@@ -7,7 +7,7 @@ import { Hookable, NestedHooks } from 'hookable';
 import { Ignore, Options } from 'ignore';
 import { TSConfig } from 'pkg-types';
 import { PresetName, PresetOptions, PresetNameInput } from 'silgi/presets';
-import { ResolvedServiceType as ResolvedServiceType$1, SilgiRuntimeShareds as SilgiRuntimeShareds$1, SilgiRuntimeOptions as SilgiRuntimeOptions$1, RouteRules as RouteRules$1, ModuleMeta as ModuleMeta$1, SilgiModule as SilgiModule$1, SilgiRouteRules as SilgiRouteRules$1, DotenvOptions as DotenvOptions$1, EnvOptions as EnvOptions$1, SilgiRuntimeConfig as SilgiRuntimeConfig$1, ServiceParseModule as ServiceParseModule$1, SilgiCLIHooks as SilgiCLIHooks$1, StorageMounts as StorageMounts$1, SilgiTemplate as SilgiTemplate$1, SilgiFrameworkInfo as SilgiFrameworkInfo$1 } from 'silgi/types';
+import { ResolvedServiceType as ResolvedServiceType$1, SilgiRuntimeShareds as SilgiRuntimeShareds$1, SilgiRuntimeOptions as SilgiRuntimeOptions$1, RouteRules as RouteRules$1, ModuleMeta as ModuleMeta$1, SilgiModule as SilgiModule$1, Commands as Commands$1, SilgiRouteRules as SilgiRouteRules$1, DotenvOptions as DotenvOptions$1, EnvOptions as EnvOptions$1, SilgiRuntimeConfig as SilgiRuntimeConfig$1, ServiceParseModule as ServiceParseModule$1, SilgiCLIHooks as SilgiCLIHooks$1, StorageMounts as StorageMounts$1, SilgiTemplate as SilgiTemplate$1, SilgiFrameworkInfo as SilgiFrameworkInfo$1 } from 'silgi/types';
 import { Adapter, TablesSchema, InferModelTypes } from 'unadapter/types';
 import { UnimportPluginOptions } from 'unimport/unplugin';
 import { H3Event } from 'h3';
@@ -583,6 +583,7 @@ interface SilgiCLIOptions extends PresetOptions {
         command?: string;
     };
     commandType: CommandType;
+    commands: Commands$1[];
     routeRules: SilgiRouteRules$1;
     environments: DotenvOptions$1[];
     activeEnvironment: 'prod' | 'docker' | 'staging' | 'testing' | '.env' | (string & {});

package/package.json

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