silgi 0.20.20 → 0.20.22

package/dist/_chunks/index.mjs

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

package/dist/cli/common.mjs

@@ -872,50 +872,50 @@ ${injectedResult.code}`;
   }
 }
 
-async function prepareServerFiles(silgi) {
-  const importItems = {
-    "silgi": {
-      import: [
-        { name: "createSilgi", key: "createSilgi" },
-        { name: "createShared", key: "createShared" }
-      ],
-      from: "silgi"
-    },
-    "silgi/types": {
-      import: [
-        { name: "SilgiRuntimeOptions", type: true, key: "SilgiRuntimeOptions" },
-        { name: "FrameworkContext", type: true, key: "FrameworkContext" }
-      ],
-      from: "silgi/types"
-    },
-    "#silgi/vfs": {
-      import: [],
-      from: "./vfs"
-    },
-    "configs.ts": {
-      import: [
-        {
-          name: "cliConfigs",
-          type: false,
-          key: "cliConfigs"
-        }
-      ],
-      from: "./configs.ts"
-    }
-  };
-  const scanned = {
-    uris: {},
-    services: [],
-    shareds: [
-      `createShared({
-        modulesURIs,
-      })`
+const importItems = {
+  "silgi": {
+    import: [
+      { name: "createSilgi", key: "createSilgi" },
+      { name: "createShared", key: "createShared" }
     ],
-    schemas: [],
-    modulesURIs: {},
-    customImports: [],
-    importItems
-  };
+    from: "silgi"
+  },
+  "silgi/types": {
+    import: [
+      { name: "SilgiRuntimeOptions", type: true, key: "SilgiRuntimeOptions" },
+      { name: "FrameworkContext", type: true, key: "FrameworkContext" }
+    ],
+    from: "silgi/types"
+  },
+  "#silgi/vfs": {
+    import: [],
+    from: "./vfs"
+  },
+  "configs.ts": {
+    import: [
+      {
+        name: "cliConfigs",
+        type: false,
+        key: "cliConfigs"
+      }
+    ],
+    from: "./configs.ts"
+  }
+};
+const scanned = {
+  uris: {},
+  services: [],
+  shareds: [
+    `createShared({
+      modulesURIs,
+    })`
+  ],
+  schemas: [],
+  modulesURIs: {},
+  customImports: [],
+  importItems
+};
+async function prepareServerFiles(silgi) {
   if (silgi.uris) {
     defu$1(scanned.uris, silgi.uris);
   }
@@ -935,12 +935,6 @@ async function prepareServerFiles(silgi) {
   if (scanned.schemas.length > 0) {
     importItems.silgi.import.push({ name: "mergeSchemas", key: "mergeSchemas" });
   }
-  for (const key in importItems) {
-    importItems[key].import = deduplicateImportsByKey(importItems[key].import);
-  }
-  scanned.services = deduplicateArray(scanned.services);
-  scanned.schemas = deduplicateArray(scanned.schemas);
-  scanned.shareds = deduplicateArray(scanned.shareds);
   const importsContent = [
     ...Object.entries(importItems).map(([_name, { from, import: imports }]) => {
       if (silgi.options.typescript.removeFileExtension) {
@@ -980,19 +974,6 @@ async function prepareServerFiles(silgi) {
   importData.unshift(...importsContent);
   return importData;
 }
-function deduplicateImportsByKey(imports) {
-  const seenKeys = /* @__PURE__ */ new Map();
-  return imports.filter((item) => {
-    if (seenKeys.has(item.key)) {
-      return false;
-    }
-    seenKeys.set(item.key, true);
-    return true;
-  });
-}
-function deduplicateArray(array) {
-  return [...new Set(array)];
-}
 
 async function writeScanFiles(silgi) {
   const data = await prepareServerFiles(silgi);
@@ -2156,6 +2137,26 @@ async function prepareSchema(silgi) {
     routeRules: [],
     routeRulesConfig: []
   };
+  function reset() {
+    data.options = [];
+    data.contexts = [];
+    data.actions = [];
+    data.shareds = [
+      {
+        key: "modulesURIs",
+        value: "{ modulesURIs: typeof modulesURIs }"
+      }
+    ];
+    data.events = [];
+    data.storeBase = [];
+    data.hooks = [];
+    data.runtimeHooks = [];
+    data.runtimeOptions = [];
+    data.methods = [];
+    data.routeRules = [];
+    data.routeRulesConfig = [];
+  }
+  reset();
   await silgi.callHook("prepare:schema.ts", data);
   relativeWithDot(silgi.options.build.typesDir, `${silgi.options.silgi.serverDir}/core.ts`);
   const silgiScanTS = relativeWithDot(silgi.options.build.typesDir, `${silgi.options.silgi.serverDir}/scan.ts`);

package/dist/meta/index.d.mts

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