silgi 0.8.30 → 0.8.32

package/dist/_chunks/index.mjs

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

package/dist/cli/prepare.mjs

@@ -35,6 +35,14 @@ import 'std-env';
 import 'consola/utils';
 import 'escape-string-regexp';
 
+async function emptyFramework(silgi) {
+  if (silgi.options.preset === "npm-package" || !silgi.options.preset) {
+    silgi.hook("after:prepare:schema.ts", (data) => {
+      data.unshift("type FrameworkContextExtends = {}");
+    });
+  }
+}
+
 async function h3Framework(silgi, skip = false) {
   if (silgi.options.preset !== "h3" && skip === false)
     return;
@@ -128,7 +136,7 @@ async function nuxtFramework(silgi, skip = false) {
   await nitroFramework(silgi, true);
 }
 
-const frameworkSetup = [h3Framework, nitroFramework, nuxtFramework];
+const frameworkSetup = [emptyFramework, h3Framework, nitroFramework, nuxtFramework];
 
 async function prepare$1(_silgi) {
 }
@@ -1161,9 +1169,6 @@ function topologicalSort(graphData) {
       logger$1.debug(`Adding initial module: ${node} (no dependencies)`);
     }
   }
-  if (queue.length === 0) {
-    logger$1.warn("No modules without dependencies found - possible circular reference");
-  }
   while (queue.length > 0) {
     const node = queue.shift();
     order.push(node);
@@ -1408,8 +1413,10 @@ async function scanFiles$1(silgi) {
       if (createServices.length > 0) {
         for (const createService of createServices) {
           const { exportName, path } = createService;
+          const randomString = hash(basename(path) + exportName);
+          const _name = `_v${randomString}`;
           silgi.hook("prepare:core.ts", (options) => {
-            options.services.push(exportName);
+            options.services.push(_name);
           });
           silgi.hook("prepare:core.ts", (options) => {
             options.importItems[path] ??= {
@@ -1417,7 +1424,7 @@ async function scanFiles$1(silgi) {
               from: relativeWithDot(silgi.options.silgi.serverDir, path)
             };
             options.importItems[path].import.push({
-              name: exportName
+              name: `${exportName} as ${_name}`
             });
           });
         }
@@ -1426,8 +1433,10 @@ async function scanFiles$1(silgi) {
       if (createSchemas.length > 0) {
         for (const createSchema of createSchemas) {
           const { exportName, path } = createSchema;
+          const randomString = hash(basename(path) + exportName);
+          const _name = `_v${randomString}`;
           silgi.hook("prepare:core.ts", (options) => {
-            options.schemas.push(exportName);
+            options.schemas.push(_name);
           });
           silgi.hook("prepare:core.ts", (options) => {
             options.importItems[path] ??= {
@@ -1435,7 +1444,7 @@ async function scanFiles$1(silgi) {
               from: relativeWithDot(silgi.options.silgi.serverDir, path)
             };
             options.importItems[path].import.push({
-              name: exportName
+              name: `${exportName} as ${_name}`
             });
           });
         }
@@ -1444,8 +1453,10 @@ async function scanFiles$1(silgi) {
       if (createShareds.length > 0) {
         for (const createShared of createShareds) {
           const { exportName, path } = createShared;
+          const randomString = hash(basename(path) + exportName);
+          const _name = `_v${randomString}`;
           silgi.hook("prepare:core.ts", (options) => {
-            options.shareds.push(exportName);
+            options.shareds.push(_name);
           });
           silgi.hook("prepare:core.ts", (options) => {
             options.importItems[path] ??= {
@@ -1454,7 +1465,7 @@ async function scanFiles$1(silgi) {
               from: relativeWithDot(silgi.options.silgi.serverDir, path)
             };
             options.importItems[path].import.push({
-              name: exportName
+              name: `${exportName} as ${_name}`
             });
           });
         }
@@ -1463,10 +1474,12 @@ async function scanFiles$1(silgi) {
       if (sharedsTypes.length > 0) {
         for (const sharedType of sharedsTypes) {
           const { exportName, path } = sharedType;
+          const randomString = hash(basename(path) + exportName);
+          const _name = `_v${randomString}`;
           silgi.hook("prepare:schema.ts", (options) => {
             options.shareds.push({
-              key: exportName,
-              value: exportName
+              key: _name,
+              value: _name
             });
           });
           silgi.hook("prepare:schema.ts", (options) => {
@@ -1475,7 +1488,7 @@ async function scanFiles$1(silgi) {
               from: path
             };
             options.importItems[path].import.push({
-              name: exportName,
+              name: `${exportName} as ${_name}`,
               type: true
             });
           });
@@ -1485,10 +1498,12 @@ async function scanFiles$1(silgi) {
       if (contextTypes.length > 0) {
         for (const contextType of contextTypes) {
           const { exportName, path } = contextType;
+          const randomString = hash(basename(path) + exportName);
+          const _name = `_v${randomString}`;
           silgi.hook("prepare:schema.ts", (options) => {
             options.contexts.push({
-              key: exportName,
-              value: exportName
+              key: _name,
+              value: _name
             });
           });
           silgi.hook("prepare:schema.ts", (options) => {
@@ -1497,7 +1512,7 @@ async function scanFiles$1(silgi) {
               from: path
             };
             options.importItems[path].import.push({
-              name: exportName,
+              name: `${exportName} as ${_name}`,
               type: true
             });
           });

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.8.30";
+const version = "0.8.32";
 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.30";
+const version = "0.8.32";
 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.30",
+  "version": "0.8.32",
   "private": false,
   "sideEffects": false,
   "exports": {