silgi 0.8.38 → 0.8.40

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.8.38";
+const version = "0.8.40";
 const devDependencies = {
 	"@antfu/eslint-config": "^4.2.0",
 	"@fastify/deepmerge": "^2.0.2",

package/dist/cli/loader.mjs

@@ -2,7 +2,7 @@ import { watchConfig, loadConfig } from 'c12';
 import { resolveCompatibilityDatesFromEnv, formatDate, resolveCompatibilityDates } from 'compatx';
 import { klona } from 'klona/full';
 import { isDebug, isTest } from 'std-env';
-import _consola from 'consola';
+import consola from 'consola';
 import { colors } from 'consola/utils';
 import { relative, join, resolve } from 'pathe';
 import escapeRE from 'escape-string-regexp';
@@ -118,11 +118,11 @@ let _fallbackInfoShown = false;
 let _promptedUserToUpdate = false;
 async function _resolveDefault(options) {
   const _todayDate = formatDate(/* @__PURE__ */ new Date());
-  const consola = _consola.withTag("silgi");
-  consola.warn(`No valid compatibility date is specified.`);
+  const consola$1 = consola.withTag("silgi");
+  consola$1.warn(`No valid compatibility date is specified.`);
   const onFallback = () => {
     if (!_fallbackInfoShown) {
-      consola.info(
+      consola$1.info(
         [
           `Using \`${fallbackCompatibilityDate}\` as fallback.`,
           `  Please specify compatibility date to avoid unwanted behavior changes:`,
@@ -135,7 +135,7 @@ async function _resolveDefault(options) {
     }
     return fallbackCompatibilityDate;
   };
-  const shallUpdate = !_promptedUserToUpdate && await consola.prompt(
+  const shallUpdate = !_promptedUserToUpdate && await consola$1.prompt(
     `Do you want to auto update config file to set ${colors.cyan(`compatibilityDate: '${_todayDate}'`)}?`,
     {
       type: "confirm",
@@ -151,7 +151,7 @@ async function _resolveDefault(options) {
     configFile: "silgi.config",
     cwd: options.rootDir,
     async onCreate({ configFile }) {
-      const shallCreate = await consola.prompt(
+      const shallCreate = await consola$1.prompt(
         `Do you want to initialize a new config in ${colors.cyan(relative(".", configFile))}?`,
         {
           type: "confirm",
@@ -167,11 +167,11 @@ async function _resolveDefault(options) {
       config.compatibilityDate = _todayDate;
     }
   }).catch((error) => {
-    consola.error(`Failed to update config: ${error.message}`);
+    consola$1.error(`Failed to update config: ${error.message}`);
     return null;
   });
   if (updateResult?.configFile) {
-    consola.success(
+    consola$1.success(
       `Compatibility date set to \`${_todayDate}\` in \`${relative(".", updateResult.configFile)}\``
     );
     return _todayDate;

package/dist/cli/prepare.mjs

@@ -8,12 +8,12 @@ import { resolvePath, parseNodeModulePath, lookupNodeModuleSubpath, resolve as r
 import { resolveAlias } from 'pathe/utils';
 import { relativeWithDot, isDirectory, writeFile, resolveAlias as resolveAlias$1, resolvePath as resolvePath$1, normalizeTemplate, useLogger, addTemplate } from 'silgi/kit';
 import { toExports, scanExports, createUnimport } from 'unimport';
+import consola, { consola as consola$1 } from 'consola';
 import { createJiti } from 'dev-jiti';
 import { readPackageJSON } from 'pkg-types';
 import { hash } from 'ohash';
 import { s as silgiGenerateType } from './types.mjs';
 import { c as commonArgs } from './common.mjs';
-import { consola } from 'consola';
 import { createHooks, createDebugger } from 'hookable';
 import { useSilgiCLI, silgiCLICtx } from 'silgi/core';
 import { pascalCase } from 'scule';
@@ -244,33 +244,48 @@ async function readCoreFile(silgi) {
     debug: silgi.options.debug,
     alias: silgi.options.alias
   });
-  const coreFile = await jiti.evalModule(
-    injectedResult.code,
-    {
-      filename: path,
-      async: true,
-      conditions: silgi.options.conditions
-    },
-    async (data, name) => {
-      return (await silgi.unimport.injectImports(data, name)).code;
-    }
-  );
-  silgi.uris = coreFile.uris;
-  silgi.schemas = coreFile.schemas;
-  silgi.services = coreFile.services;
-  silgi.shareds = coreFile.shareds;
-  silgi.modulesURIs = coreFile.modulesURIs;
-  return {
-    context,
-    object: {
-      schemas: coreFile.schemas,
-      uris: coreFile.uris,
-      services: coreFile.services,
-      shareds: coreFile.shareds,
-      modulesURIs: coreFile.modulesURIs
-    },
-    path
-  };
+  try {
+    const coreFile = await jiti.evalModule(
+      injectedResult.code,
+      {
+        filename: path,
+        async: true,
+        conditions: silgi.options.conditions
+      },
+      async (data, name) => {
+        return (await silgi.unimport.injectImports(data, name)).code;
+      }
+    );
+    silgi.uris = coreFile.uris;
+    silgi.schemas = coreFile.schemas;
+    silgi.services = coreFile.services;
+    silgi.shareds = coreFile.shareds;
+    silgi.modulesURIs = coreFile.modulesURIs;
+    return {
+      context,
+      object: {
+        schemas: coreFile.schemas,
+        uris: coreFile.uris,
+        services: coreFile.services,
+        shareds: coreFile.shareds,
+        modulesURIs: coreFile.modulesURIs
+      },
+      path
+    };
+  } catch (error) {
+    consola.error("Failed to read core.ts file:", error);
+    return {
+      context,
+      object: {
+        schemas: {},
+        uris: {},
+        services: {},
+        shareds: {},
+        modulesURIs: {}
+      },
+      path
+    };
+  }
 }
 
 function traverseObject(silgi, obj, currentPath = []) {
@@ -971,7 +986,7 @@ async function installModule(moduleToInstall, silgi = useSilgiCLI(), inlineOptio
   }
 }
 
-const logger$1 = consola;
+const logger$1 = consola$1;
 async function _resolveSilgiModule(mod, silgi) {
   let _url;
   let buildTimeModuleMeta = {};
@@ -1066,28 +1081,26 @@ function createDependencyGraph(modules) {
       return;
     const requiredDeps = module.meta?.requiredDependencies || [];
     const afterDeps = module.meta?.afterDependencies || [];
-    requiredDeps.forEach((dep) => {
+    const allDeps = /* @__PURE__ */ new Set([...requiredDeps, ...afterDeps]);
+    allDeps.forEach((dep) => {
       if (!graph.has(dep)) {
-        throw new Error(`Required dependency "${dep}" for module "${key}" is missing`);
-      }
-      graph.get(key)?.add(dep);
-      inDegree.set(key, (inDegree.get(key) || 0) + 1);
-      logger$1.debug(`${key} requires ${dep}`);
-    });
-    afterDeps.forEach((dep) => {
-      if (!graph.has(dep)) {
-        logger$1.debug(`Optional dependency for ${key}: "${dep}" (afterDependencies) not found, skipping`);
+        if (requiredDeps.includes(dep)) {
+          throw new Error(`Required dependency "${dep}" for module "${key}" is missing`);
+        }
+        logger$1.debug(`Optional dependency for ${key}: "${dep}" not found, skipping`);
         return;
       }
-      graph.get(key)?.add(dep);
+      graph.get(dep)?.add(key);
       inDegree.set(key, (inDegree.get(key) || 0) + 1);
-      logger$1.debug(`${key} will run after ${dep}`);
+      const depType = requiredDeps.includes(dep) ? "required" : "after";
+      logger$1.debug(`${key} depends on ${dep} (${depType})`);
     });
   });
   logger$1.debug("\nDependency Graph:");
   for (const [module, deps] of graph.entries()) {
     const depsStr = Array.from(deps).join(", ");
-    logger$1.debug(`${module} -> [${depsStr}] (in-degree: ${inDegree.get(module)})`);
+    logger$1.debug(`${module} -> ${depsStr} (deps run after this module)`);
+    logger$1.debug(`${module} in-degree: ${inDegree.get(module)}`);
   }
   return { graph, inDegree };
 }
@@ -1352,7 +1365,7 @@ async function scanFiles$1(silgi) {
       if (caseCorrected) {
         const original = relative(silgi.options.serverDir, dir);
         const corrected = relative(silgi.options.serverDir, join(dirname(dir), caseCorrected));
-        consola.warn(`Components not scanned from \`~/${corrected}\`. Did you mean to name the directory \`~/${original}\` instead?`);
+        consola$1.warn(`Components not scanned from \`~/${corrected}\`. Did you mean to name the directory \`~/${original}\` instead?`);
       }
     }
   }
@@ -1706,7 +1719,7 @@ async function createSilgiCLI(config = {}, opts = {}) {
     hooks,
     // vfs: {}
     _requiredModules: {},
-    logger: consola.withTag("silgi"),
+    logger: consola$1.withTag("silgi"),
     close: () => silgi.hooks.callHook("close", silgi),
     storage: void 0,
     scanModules: [],

package/dist/kit/index.mjs

@@ -1,6 +1,6 @@
 import { resolvePath as resolvePath$1 } from 'mlly';
 import fsp from 'node:fs/promises';
-import _consola, { consola } from 'consola';
+import consola, { consola as consola$1 } from 'consola';
 import { relative, resolve, dirname, normalize, isAbsolute, join, parse, basename } from 'pathe';
 import { colors } from 'consola/utils';
 import { getProperty } from 'dot-prop';
@@ -41,7 +41,7 @@ function _compilePathTemplate(contents) {
   return (params) => contents.replace(/\{\{ ?([\w.]+) ?\}\}/g, (_, match) => {
     const val = getProperty(params, match);
     if (!val) {
-      _consola.warn(
+      consola.warn(
         `cannot resolve template param '${match}' in ${contents.slice(0, 20)}`
       );
     }
@@ -57,7 +57,7 @@ async function writeFile(file, contents, log = false) {
     typeof contents === "string" ? "utf8" : void 0
   );
   if (log) {
-    consola.info("Generated", prettyPath(file));
+    consola$1.info("Generated", prettyPath(file));
   }
 }
 async function isDirectory$1(path) {
@@ -90,7 +90,7 @@ function isH3() {
   return false;
 }
 
-const logger = consola;
+const logger = consola$1;
 function useLogger(tag, options = {}) {
   return tag ? logger.create(options).withTag(tag) : logger;
 }

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.8.38";
+const version = "0.8.40";
 const devDependencies = {
 	"@antfu/eslint-config": "^4.2.0",
 	"@fastify/deepmerge": "^2.0.2",

package/dist/meta/index.d.ts

@@ -1,4 +1,4 @@
-const version = "0.8.38";
+const version = "0.8.40";
 const devDependencies = {
 	"@antfu/eslint-config": "^4.2.0",
 	"@fastify/deepmerge": "^2.0.2",

package/package.json

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