@llmist/cli 8.0.0 → 8.1.0

package/dist/cli.js

@@ -843,11 +843,39 @@ function isExternalPackageSpecifier(specifier) {
 function parseGadgetSpecifier(specifier) {
   if (specifier.startsWith("git+")) {
     const url = specifier.slice(4);
-    const [baseUrl, ref] = url.split("#");
+    let baseUrl;
+    let ref;
+    let preset;
+    if (url.includes("#")) {
+      const hashIndex = url.indexOf("#");
+      baseUrl = url.slice(0, hashIndex);
+      const refAndPreset = url.slice(hashIndex + 1);
+      if (refAndPreset.includes(":")) {
+        const colonIndex = refAndPreset.indexOf(":");
+        ref = refAndPreset.slice(0, colonIndex);
+        preset = refAndPreset.slice(colonIndex + 1);
+      } else {
+        ref = refAndPreset;
+      }
+    } else {
+      const gitExtIndex = url.indexOf(".git");
+      if (gitExtIndex !== -1) {
+        const afterGit = url.slice(gitExtIndex + 4);
+        if (afterGit.startsWith(":")) {
+          baseUrl = url.slice(0, gitExtIndex + 4);
+          preset = afterGit.slice(1);
+        } else {
+          baseUrl = url;
+        }
+      } else {
+        baseUrl = url;
+      }
+    }
     return {
       type: "git",
       package: baseUrl,
-      version: ref
+      version: ref,
+      preset
     };
   }
   const npmMatch = specifier.match(
@@ -1019,7 +1047,41 @@ async function loadExternalGadgets(specifier, forceInstall = false) {
     const message = error instanceof Error ? error.message : String(error);
     throw new Error(`Failed to import '${specifier}': ${message}`);
   }
-  let gadgets = extractGadgetsFromModule(exports);
+  let gadgets = [];
+  if (manifest?.factory) {
+    const exportsObj = exports;
+    if (spec.preset && typeof exportsObj.createGadgetsByPreset === "function") {
+      const result = await exportsObj.createGadgetsByPreset(
+        spec.preset
+      );
+      gadgets = extractGadgetsFromModule(result);
+      gadgetNames = null;
+    } else if (gadgetNames && typeof exportsObj.createGadgetsByName === "function") {
+      const result = await exportsObj.createGadgetsByName(
+        gadgetNames
+      );
+      gadgets = extractGadgetsFromModule(result);
+      gadgetNames = null;
+    } else {
+      const factoryNames = [
+        "createGadgets",
+        "createDhalsimGadgets",
+        "createAllGadgets",
+        "gadgets",
+        "default"
+      ];
+      for (const name of factoryNames) {
+        if (typeof exportsObj[name] === "function") {
+          const result = await exportsObj[name]();
+          gadgets = extractGadgetsFromModule(result);
+          if (gadgets.length > 0) break;
+        }
+      }
+    }
+  }
+  if (gadgets.length === 0) {
+    gadgets = extractGadgetsFromModule(exports);
+  }
   if (gadgetNames) {
     const gadgetSet = new Set(gadgetNames.map((n) => n.toLowerCase()));
     gadgets = gadgets.filter((g) => {