@jointhedots/gear 1.1.11 → 1.1.12

package/esm/model/helpers/config-loader.js

@@ -67,7 +67,7 @@ export function readConfigFileSync(path) {
  * Find config files matching a base name (e.g. "bundle.component") in a directory.
  * Returns all matching paths across supported extensions.
  */
-export function findConfigFiles(dir, baseName, fnames) {
+export function findConfigFile(dir, baseName, fnames) {
     const results = [];
     for (const ext of config_extensions) {
         const fname = baseName + ext;
@@ -80,7 +80,12 @@ export function findConfigFiles(dir, baseName, fnames) {
             results.push(`${dir}/${fname}`);
         }
     }
-    return results;
+    if (results.length === 0)
+        return undefined;
+    if (results.length > 1) {
+        throw new Error(`Multiple config files found for '${baseName}': ${results.join(", ")}. Only one format is allowed.`);
+    }
+    return results[0];
 }
 /**
  * Read a singleton config file (exactly one format must exist).
@@ -88,13 +93,8 @@ export function findConfigFiles(dir, baseName, fnames) {
  * Returns `undefined` if no matching file exists.
  */
 export async function readSingletonConfigFile(dir, baseName, fnames) {
-    const paths = findConfigFiles(dir, baseName, fnames);
-    if (paths.length === 0)
-        return undefined;
-    if (paths.length > 1) {
-        throw new Error(`Multiple config files found for '${baseName}': ${paths.join(", ")}. Only one format is allowed.`);
-    }
-    const data = await readConfigFile(paths[0]);
-    return data !== undefined ? { data, path: paths[0] } : undefined;
+    const path = findConfigFile(dir, baseName, fnames);
+    const data = await readConfigFile(path);
+    return data !== undefined ? { data, path } : undefined;
 }
 //# sourceMappingURL=config-loader.js.map

package/esm/model/helpers/discover-workspace.js

@@ -5,9 +5,9 @@ import { checkComponentManifest } from "../component.js";
 import { makeNormalizedName, NameStyle } from "../../utils/normalized-name.js";
 import { create_manifests } from "./create-manifests.js";
 import { Bundle, Library, Workspace } from "../workspace.js";
-import { make_canonical_path, make_normalized_dirname, make_normalized_path, make_relative_path } from "../../utils/file.js";
-import { is_config_filename, readConfigFile, readSingletonConfigFile } from "./config-loader.js";
-const exclude_dirs = ["node_modules"];
+import { file, make_canonical_path, make_normalized_dirname, make_normalized_path, make_relative_path } from "../../utils/file.js";
+import { findConfigFile, is_config_filename, readConfigFile, readSingletonConfigFile } from "./config-loader.js";
+const exclude_dirs = ["node_modules", ".git"];
 function is_ignored_dir(ws, path) {
     const normalized_path = make_normalized_path(path);
     for (const ignored of ws.ignored_directories) {
@@ -97,7 +97,9 @@ async function discover_library_components(lib, path, subdir = false) {
         const fstat = await Fsp.stat(fpath);
         if (fstat.isDirectory()) {
             if (!exclude_dirs.includes(fname)) {
-                await discover_library_components(lib, fpath, true);
+                if (await discover_library(lib.workspace, fpath, lib.installed) === Discovered.None) {
+                    await discover_library_components(lib, fpath, true);
+                }
             }
         }
         else if (fstat.isFile()) {
@@ -115,15 +117,6 @@ async function discover_library_components(lib, path, subdir = false) {
             }
         }
     }
-    // Analyze library deployment manifest (supports json/yaml/yml/toml, singleton)
-    const manifest_result = await readSingletonConfigFile(path, "bundle.manifest", fnames);
-    if (manifest_result) {
-        const manifest = manifest_result.data;
-        for (const pub of manifest.data.components) {
-            const fpath = path + "/" + (pub.ref ?? pub.id);
-            await discover_component(lib, fpath);
-        }
-    }
 }
 function make_library_bundle_manifest(lib, file_desc) {
     let $id = file_desc?.$id;
@@ -174,53 +167,71 @@ function make_library_bundle_manifest(lib, file_desc) {
     };
     return manifest;
 }
+var Discovered;
+(function (Discovered) {
+    Discovered[Discovered["None"] = 0] = "None";
+    Discovered[Discovered["Ignored"] = 1] = "Ignored";
+    Discovered[Discovered["Registered"] = 2] = "Registered";
+})(Discovered || (Discovered = {}));
 async function discover_library(ws, location, installed) {
     const lib_path = make_canonical_path(ws.path, location);
     if (is_ignored_dir(ws, lib_path))
-        return false;
+        return Discovered.Ignored;
+    const package_path = lib_path + "/package.json";
+    const manifest_path = findConfigFile(lib_path, "bundle.manifest");
+    if (!file.exists(package_path) && !file.exists(manifest_path))
+        return Discovered.None;
     const lib_not_exists = ws.libraries.reduce((r, lib) => r && lib.path !== lib_path, true);
-    if (lib_not_exists) {
-        const lib_desc = await readJsonFile(lib_path + "/package.json");
-        if (!lib_desc?.name)
-            return false;
-        const bundle_result = await readSingletonConfigFile(lib_path, "bundle.component");
-        const bundle_desc = bundle_result?.data;
-        if (bundle_desc || !installed) {
-            const other = ws.get_library(lib_desc.name);
-            if (other) {
-                if (lib_path.includes(other.path)) {
-                    ws.log.info(`ignore library build at ${lib_path}`);
-                    return false;
-                }
-                else {
-                    throw new Error(`library '${lib_desc.name}' declared multiple times\n - ${other.path}\n - ${lib_path}`);
-                }
+    if (!lib_not_exists)
+        return Discovered.Ignored;
+    const lib_desc = await readJsonFile(package_path);
+    if (!lib_desc?.name)
+        return Discovered.Ignored;
+    const manifest_desc = await readConfigFile(manifest_path);
+    if (manifest_desc || !installed) {
+        const other = ws.get_library(lib_desc.name);
+        if (other) {
+            if (lib_path.includes(other.path)) {
+                ws.log.info(`ignore library build at ${lib_path}`);
+                return Discovered.Ignored;
             }
-            const lib = new Library(lib_desc.name, lib_path, lib_desc, ws);
-            ws.libraries.push(lib);
-            ws.log.info(`+ 📚 library: ${lib.get_id()} (${make_relative_path(ws.path, location)})`);
-            if (bundle_desc) {
-                setup_library_bundle(lib, bundle_desc);
+            else {
+                throw new Error(`library '${lib_desc.name}' declared multiple times\n - ${other.path}\n - ${lib_path}`);
             }
-            const lib_search_path = lib_path + "/node_modules";
-            if (Fs.existsSync(lib_search_path)) {
-                lib.search_directories.push(lib_search_path);
+        }
+        const lib = new Library(lib_desc.name, lib_path, lib_desc, ws, installed);
+        ws.libraries.push(lib);
+        ws.log.info(`+ 📚 library: ${installed ? "⏬" : "🐣"} ${lib.get_id()} (${make_relative_path(ws.path, location)})`);
+        // Setup library infos from bundle manifest
+        if (manifest_desc) {
+            setup_library_bundle(lib, manifest_desc);
+            // Analyze library deployment manifest (supports json/yaml/yml/toml, singleton)
+            for (const pub of manifest_desc.data.components) {
+                const fpath = lib_path + "/" + (pub.ref ?? pub.id);
+                await discover_component(lib, fpath);
             }
-            await discover_library_components(lib, lib_path);
-            return true;
         }
+        // Setup node search directory
+        const lib_search_path = lib_path + "/node_modules";
+        if (Fs.existsSync(lib_search_path)) {
+            lib.search_directories.push(lib_search_path);
+        }
+        // Collect library declaration
+        await discover_library_components(lib, lib_path);
+        return Discovered.Registered;
     }
-    return false;
+    return Discovered.None;
 }
 async function discover_workspace_libraries(ws) {
     async function walk(dir) {
-        await discover_library(ws, dir, false);
-        for (const entry of Fs.readdirSync(dir, { withFileTypes: true })) {
-            if (entry.name === "node_modules")
-                continue;
-            const fullPath = dir + "/" + entry.name;
-            if (entry.isDirectory()) {
-                await walk(fullPath);
+        if (await discover_library(ws, dir, false) === Discovered.None) {
+            for (const entry of Fs.readdirSync(dir, { withFileTypes: true })) {
+                if (entry.name === "node_modules")
+                    continue;
+                const fullPath = dir + "/" + entry.name;
+                if (entry.isDirectory()) {
+                    await walk(fullPath);
+                }
             }
         }
     }

package/esm/model/workspace.js

@@ -25,17 +25,19 @@ export class Library extends WorkspaceItem {
     path;
     descriptor;
     workspace;
+    installed;
     bundle = null;
     declarations = new Map();
     applications = new Map();
     externals = {};
     search_directories = null;
-    constructor(name, path, descriptor, workspace) {
+    constructor(name, path, descriptor, workspace, installed) {
         super(workspace, `lib:${name}`);
         this.name = name;
         this.path = path;
         this.descriptor = descriptor;
         this.workspace = workspace;
+        this.installed = installed;
         this.search_directories = workspace.search_directories.slice();
         Object.assign(this.externals, descriptor.peerDependencies, descriptor.dependencies);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@jointhedots/gear",
-   "version": "1.1.11",
+   "version": "1.1.12",
    "type": "module",
    "bin": {
       "jointhedots-gear": "esm/cli.js"
@@ -23,6 +23,7 @@
       "serve:mono": "node --enable-source-maps --watch-path=esm esm/cli serve --app playground:ui --devmode --port 3002 --ws ../jointhedots-core",
       "serve:host": "node --enable-source-maps --watch-path=esm esm/cli serve --app playground:ui:host  --port 3002 --ws ../jointhedots-core",
       "serve:sfe": "node --enable-source-maps --watch-path=esm esm/cli serve --app sfe-demo --devmode --ws ../sf-explorer-app",
+      "serve:demo": "node --enable-source-maps --watch-path=esm esm/cli serve --app sfe-demo --devmode --ws ../sf-explorer-demo",
       "make:sfe": "node --enable-source-maps --watch-path=esm esm/cli make --libs @sf-explorer/app --devmode --ws ../sf-explorer-app",
       "prepublishOnly": "node scripts/prepublish.mjs"
    },