silgi 0.20.22 → 0.20.24

package/dist/_chunks/index.mjs

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

package/dist/cli/common.mjs

@@ -872,50 +872,51 @@ ${injectedResult.code}`;
   }
 }
 
-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,
-    })`
-  ],
-  schemas: [],
-  modulesURIs: {},
-  customImports: [],
-  importItems
-};
 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 createScannedObject = () => ({
+    uris: {},
+    services: [],
+    shareds: [
+      `createShared({
+        modulesURIs,
+      })`
+    ],
+    schemas: [],
+    modulesURIs: {},
+    customImports: [],
+    importItems: JSON.parse(JSON.stringify(importItems))
+  });
+  const scanned = createScannedObject();
   if (silgi.uris) {
     defu$1(scanned.uris, silgi.uris);
   }
@@ -923,20 +924,26 @@ async function prepareServerFiles(silgi) {
     defu$1(scanned.modulesURIs, silgi.modulesURIs);
   }
   await silgi.callHook("prepare:scan.ts", scanned);
-  if (importItems["#silgi/vfs"].import.length === 0) {
-    delete importItems["#silgi/vfs"];
+  if (scanned.importItems["#silgi/vfs"].import.length === 0) {
+    delete scanned.importItems["#silgi/vfs"];
   }
   if (scanned.services.length > 0) {
-    importItems.silgi.import.push({ name: "mergeServices", key: "mergeServices" });
+    scanned.importItems.silgi.import.push({ name: "mergeServices", key: "mergeServices" });
   }
   if (scanned.shareds.length > 0) {
-    importItems.silgi.import.push({ name: "mergeShared", key: "mergeShared" });
+    scanned.importItems.silgi.import.push({ name: "mergeShared", key: "mergeShared" });
   }
   if (scanned.schemas.length > 0) {
-    importItems.silgi.import.push({ name: "mergeSchemas", key: "mergeSchemas" });
+    scanned.importItems.silgi.import.push({ name: "mergeSchemas", key: "mergeSchemas" });
   }
+  for (const key in scanned.importItems) {
+    scanned.importItems[key].import = deduplicateImportsByKey(scanned.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 }]) => {
+    ...Object.entries(scanned.importItems).map(([_name, { from, import: imports }]) => {
       if (silgi.options.typescript.removeFileExtension) {
         from = from.replace(/\.(js|ts|mjs|cjs|jsx|tsx)$/, "");
       }
@@ -970,10 +977,26 @@ async function prepareServerFiles(silgi) {
     scanned.shareds.length > 0 ? "])" : "}",
     ""
   ];
-  await silgi.callHook("after:prepare:scan.ts", importData);
+  const afterHookData = [...importData];
+  await silgi.callHook("after:prepare:scan.ts", afterHookData);
+  importData.length = 0;
+  importData.push(...afterHookData);
   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);

package/dist/meta/index.d.mts

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