silgi 0.20.25 → 0.20.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/_chunks/index.mjs +1 -1
- package/dist/cli/common.mjs +15 -22
- package/dist/meta/index.d.mts +1 -1
- package/dist/meta/index.d.ts +1 -1
- package/package.json +1 -1
package/dist/_chunks/index.mjs
CHANGED
package/dist/cli/common.mjs
CHANGED
|
@@ -914,43 +914,39 @@ async function prepareServerFiles(silgi) {
|
|
|
914
914
|
schemas: [],
|
|
915
915
|
modulesURIs: {},
|
|
916
916
|
customImports: [],
|
|
917
|
-
importItems
|
|
917
|
+
importItems
|
|
918
918
|
};
|
|
919
919
|
if (silgi.uris) {
|
|
920
|
-
scanned.uris
|
|
920
|
+
defu$1(scanned.uris, silgi.uris);
|
|
921
921
|
}
|
|
922
922
|
if (silgi.modulesURIs) {
|
|
923
|
-
scanned.modulesURIs
|
|
923
|
+
defu$1(scanned.modulesURIs, silgi.modulesURIs);
|
|
924
924
|
}
|
|
925
|
-
|
|
926
|
-
|
|
927
|
-
|
|
928
|
-
if (scanned.importItems["#silgi/vfs"]?.import?.length === 0) {
|
|
929
|
-
delete scanned.importItems["#silgi/vfs"];
|
|
925
|
+
await silgi.callHook("prepare:scan.ts", scanned);
|
|
926
|
+
if (importItems["#silgi/vfs"].import.length === 0) {
|
|
927
|
+
delete importItems["#silgi/vfs"];
|
|
930
928
|
}
|
|
931
929
|
if (scanned.services.length > 0) {
|
|
932
|
-
|
|
930
|
+
importItems.silgi.import.push({ name: "mergeServices", key: "mergeServices" });
|
|
933
931
|
}
|
|
934
932
|
if (scanned.shareds.length > 0) {
|
|
935
|
-
|
|
933
|
+
importItems.silgi.import.push({ name: "mergeShared", key: "mergeShared" });
|
|
936
934
|
}
|
|
937
935
|
if (scanned.schemas.length > 0) {
|
|
938
|
-
|
|
936
|
+
importItems.silgi.import.push({ name: "mergeSchemas", key: "mergeSchemas" });
|
|
939
937
|
}
|
|
940
|
-
for (const key in
|
|
941
|
-
|
|
938
|
+
for (const key in importItems) {
|
|
939
|
+
importItems[key].import = deduplicateImportsByKey(importItems[key].import);
|
|
942
940
|
}
|
|
943
941
|
scanned.services = deduplicateArray(scanned.services);
|
|
944
942
|
scanned.schemas = deduplicateArray(scanned.schemas);
|
|
945
943
|
scanned.shareds = deduplicateArray(scanned.shareds);
|
|
946
|
-
scanned.customImports = deduplicateArray(scanned.customImports);
|
|
947
944
|
const importsContent = [
|
|
948
|
-
...Object.entries(
|
|
949
|
-
let fromPath = from;
|
|
945
|
+
...Object.entries(importItems).map(([_name, { from, import: imports }]) => {
|
|
950
946
|
if (silgi.options.typescript.removeFileExtension) {
|
|
951
|
-
|
|
947
|
+
from = from.replace(/\.(js|ts|mjs|cjs|jsx|tsx)$/, "");
|
|
952
948
|
}
|
|
953
|
-
return `import { ${imports.map(({ type, name }) => type ? `type ${name}` : name).join(", ")} } from '${
|
|
949
|
+
return `import { ${imports.map(({ type, name }) => type ? `type ${name}` : name).join(", ")} } from '${from}'`;
|
|
954
950
|
}),
|
|
955
951
|
"",
|
|
956
952
|
...scanned.customImports,
|
|
@@ -980,10 +976,7 @@ async function prepareServerFiles(silgi) {
|
|
|
980
976
|
scanned.shareds.length > 0 ? "])" : "}",
|
|
981
977
|
""
|
|
982
978
|
];
|
|
983
|
-
|
|
984
|
-
await silgi.callHook("after:prepare:scan.ts", afterHookData);
|
|
985
|
-
importData.length = 0;
|
|
986
|
-
importData.push(...afterHookData);
|
|
979
|
+
await silgi.callHook("after:prepare:scan.ts", importData);
|
|
987
980
|
importData.unshift(...importsContent);
|
|
988
981
|
return importData;
|
|
989
982
|
}
|
package/dist/meta/index.d.mts
CHANGED
package/dist/meta/index.d.ts
CHANGED