@jointhedots/gear 1.2.2 → 1.2.3

package/esm/workspace/workspace.d.ts

@@ -1,6 +1,7 @@
 import { type BundleID, type BundleManifest, type ComponentManifest, type DistributedConfig } from "./component.ts";
 import type { WebAppManifest } from "web-app-manifest";
 import { Logger, Log } from "./helpers/logger.ts";
+import type { PackageDepsInfo } from "./helpers/lockfile.ts";
 export type FileID = string;
 export type ModuleID = string;
 export type ExportID = string;
@@ -91,34 +92,35 @@ export interface PackageDescriptor {
     };
     [metadata: string]: any;
 }
-export declare class WorkspaceItem {
+export declare abstract class WorkspaceItem {
     readonly workspace: Workspace;
     readonly log: Log;
     constructor(workspace: Workspace, loggerId: string);
+    make_file_id(prefix: string, id: string): string;
+    abstract resolve_entry_path(entryId: string, baseDir: string): string;
 }
 export declare class Library extends WorkspaceItem {
     readonly name: string;
     readonly path: FileID;
     readonly descriptor: PackageDescriptor;
     readonly workspace: Workspace;
-    bundle: Bundle;
+    master: Bundle;
     declarations: Map<string, DeclarationDescriptor>;
     applications: Map<string, AppDescriptor>;
     externals: Record<string, string>;
-    resolved_versions: Record<string, string>;
+    deps: PackageDepsInfo;
     search_directories: FileID[];
     constants: Constants;
     shelve: Bundle[];
     constructor(name: string, path: FileID, descriptor: PackageDescriptor, workspace: Workspace);
     get_id(): string;
     get_bundle(id: string): Bundle;
-    make_file_id(prefix: string, id: string): string;
     resolve_entry_path(entryId: string, baseDir: string): string;
 }
 export declare class Bundle extends WorkspaceItem {
     manifest: BundleManifest;
     readonly path: string;
-    readonly workspace: Workspace;
+    readonly library: Library;
     readonly source: Library;
     alias: string;
     components: Map<string, ComponentManifest>;
@@ -126,13 +128,14 @@ export declare class Bundle extends WorkspaceItem {
         [packageName: string]: string | DistributedConfig;
     };
     configured: boolean;
-    constructor(manifest: BundleManifest, path: string, workspace: Workspace, source?: Library);
+    constructor(manifest: BundleManifest, path: string, library: Library, source?: Library);
     get id(): BundleID;
     get dependencies(): string[];
     get exports(): {
         [id: string]: string;
     };
     resolve_export(ref: string): string;
+    resolve_entry_path(entryId: string, baseDir: string): string;
 }
 export type Constants = {
     [key: string]: string | number;
@@ -147,12 +150,13 @@ export declare class Workspace {
     readonly version: string;
     readonly path: string;
     readonly devmode: boolean;
+    readonly debugmode: boolean;
     libraries: Library[];
     constants: Constants;
     ignored_directories: Set<string>;
     readonly logger: Logger;
     readonly log: Log;
-    constructor(name: string, version: string, path: string, devmode: boolean);
+    constructor(name: string, version: string, path: string, devmode: boolean, debugmode?: boolean);
     get_bundle(id: string): Bundle;
     get_library(name: string): Library;
     get_application(name: string): AppEntry;

package/esm/workspace/workspace.js

@@ -16,6 +16,12 @@ export class WorkspaceItem {
         this.workspace = workspace;
         this.log = workspace.logger.get(loggerId);
     }
+    make_file_id(prefix, id) {
+        const base = this.workspace.debugmode
+            ? id.replace(/[^a-zA-Z0-9]+/g, "_")
+            : computeNameHashID(id);
+        return base ? prefix + "." + base : prefix;
+    }
 }
 // Une librairie represente des plans de construction avec un ensemble de code source 
 export class Library extends WorkspaceItem {
@@ -23,11 +29,11 @@ export class Library extends WorkspaceItem {
     path;
     descriptor;
     workspace;
-    bundle = null;
+    master = null;
     declarations = new Map();
     applications = new Map();
     externals = {};
-    resolved_versions = {};
+    deps;
     search_directories = [];
     constants = {};
     shelve = [];
@@ -54,11 +60,6 @@ export class Library extends WorkspaceItem {
         }
         return null;
     }
-    make_file_id(prefix, id) {
-        const devmode = true;
-        const base = devmode ? id.replace(/[^a-zA-Z0-9]+/g, "_") : computeNameHashID(id);
-        return base ? prefix + "." + base : prefix;
-    }
     resolve_entry_path(entryId, baseDir) {
         const fpath = make_normalized_path(Path.resolve(baseDir, entryId));
         if (entryId.startsWith("."))
@@ -78,17 +79,17 @@ export class Library extends WorkspaceItem {
 export class Bundle extends WorkspaceItem {
     manifest;
     path;
-    workspace;
+    library;
     source;
     alias;
     components = new Map();
     distribueds = {};
     configured = false;
-    constructor(manifest, path, workspace, source = null) {
-        super(workspace, `bundle:${manifest.$id}`);
+    constructor(manifest, path, library, source = null) {
+        super(library.workspace, `bundle:${manifest.$id}`);
         this.manifest = manifest;
         this.path = path;
-        this.workspace = workspace;
+        this.library = library;
         this.source = source;
         this.configured = (source === null);
     }
@@ -108,6 +109,15 @@ export class Bundle extends WorkspaceItem {
         }
         return this.exports?.[ref];
     }
+    resolve_entry_path(entryId, baseDir) {
+        const fpath = make_normalized_path(Path.resolve(baseDir, entryId));
+        if (entryId.startsWith("."))
+            return fpath;
+        if (this.source) {
+            return this.source.resolve_entry_path(entryId, baseDir);
+        }
+        return null;
+    }
 }
 // Workspace est l'objet a travers lequel on connecte tous les elements
 export class Workspace {
@@ -115,22 +125,24 @@ export class Workspace {
     version;
     path;
     devmode;
+    debugmode;
     libraries = [];
     constants = {};
     ignored_directories = new Set();
     logger = new Logger();
     log;
-    constructor(name, version, path, devmode) {
+    constructor(name, version, path, devmode, debugmode = false) {
         this.name = name;
         this.version = version;
         this.path = path;
         this.devmode = devmode;
+        this.debugmode = debugmode;
         this.log = this.logger.get(`workspace:${name}`);
     }
     get_bundle(id) {
         for (const lib of this.libraries) {
-            if (lib.bundle.id === id)
-                return lib.bundle;
+            if (lib.master.id === id)
+                return lib.master;
         }
         for (const lib of this.libraries) {
             const bun = lib.get_bundle(id);

package/package.json

@@ -1,74 +1,75 @@
-{
-   "name": "@jointhedots/gear",
-   "version": "1.2.2",
-   "type": "module",
-   "packageManager": "pnpm@10.30.3",
-   "bin": {
-      "jointhedots-gear": "esm/cli.js"
-   },
-   "exports": {
-      "./workspace": "./esm/workspace/mod.js",
-      "./core": {
-         "browser": "./esm/core/mod-browser.js",
-         "node": "./esm/core/mod-node.js",
-         "deno": "./src/core/mod.ts",
-         "default": "./esm/core/mod.js"
-      }
-   },
-   "files": [
-      "esm",
-      "browser-modules",
-      "schemas",
-      "!**/*.map"
-   ],
-   "scripts": {
-      "watch": "tsc -w --sourceMap",
-      "build": "tsc",
-      ":serve": "deno --allow-all --watch=src src/cli.ts serve --app playground:agent --devmode --port 3001 --ws ../jointhedots-core/packages/jointhedots-agent",
-      ":build:core": "deno --allow-all --watch=src src/cli.ts make --buns jointhedots.core --devmode --ws ../jointhedots-core/packages/jointhedots-core",
-      ":build:ui": "deno --allow-all --watch=src src/cli.ts make --buns jointhedots.ui --ws ../jointhedots-core/packages/jointhedots-ui",
-      ":build:cortex": "deno --allow-all --watch=src src/cli.ts make --buns @jointhedots/cortex --devmode --ws ../jointhedots-core/packages/jointhedots-cortex",
-      ":build:libs": "deno --allow-all --watch=src src/cli.ts make --libs @jointhedots/core,@jointhedots/ui --devmode --ws ../jointhedots-core",
-      ":build:lib:core": "deno --allow-all --watch=src src/cli.ts make --libs @jointhedots/core --devmode --ws ../jointhedots-core/packages/jointhedots-core",
-      ":build:lib:ui": "deno --allow-all --watch=src src/cli.ts make --libs @jointhedots/ui --devmode --ws ../jointhedots-core/packages/jointhedots-ui",
-      ":build:app": "deno --allow-all --watch=src src/cli.ts make --apps playground:ui --ws ../jointhedots-core",
-      "serve:mono": "deno --allow-all --watch=src src/cli.ts serve --app playground:ui --devmode --port 3002 --ws ../jointhedots-core",
-      "serve:host": "deno --allow-all --watch=src src/cli.ts serve --app playground:ui:host --devmode --port 3002 --ws ../jointhedots-core",
-      "serve:sfe": "deno --allow-all --watch=src src/cli.ts serve --app sfe-webapp --devmode --ws ../sf-explorer-app",
-      "serve:demo": "deno --allow-all --watch=src src/cli.ts serve --app sfe-demo --devmode --ws ../sf-explorer-demo",
-      "make:sfe": "deno --allow-all --watch=src src/cli.ts make --libs @sf-explorer/app --devmode --ws ../sf-explorer-app",
-      "prepublishOnly": "node scripts/prepublish.mjs"
-   },
-   "dependencies": {
-      "@jspm/core": "^2.1.0",
-      "@tailwindcss/postcss": "~4.1.3",
-      "@typescript/native-preview": "^7.0.0-dev.20260310.1",
-      "json-schema": "^0.4.0",
-      "vscode-uri": "^3.1.0",
-      "zod": "^4.3.6",
-      "dotenv": "~17.2.3",
-      "esbuild": "~0.27.2",
-      "esbuild-sass-plugin": "~3.6.0",
-      "express": "~5.2.1",
-      "mime": "~4.1.0",
-      "postcss": "~8.5.6",
-      "sass": "~1.97.2",
-      "semver": "~7.7.3",
-      "sharp": "~0.34.5",
-      "toml": "^3.0.0",
-      "typescript": "~5.9.3",
-      "yaml": "^2.8.2",
-      "yargs": "~18.0.0"
-   },
-   "devDependencies": {
-      "@polycuber/script.cli": "~1.0.5",
-      "@types/chrome": "~0.1.33",
-      "@types/node": "~22.7.4",
-      "@types/semver": "~7.7.1",
-      "@types/web-app-manifest": "~1.0.9",
-      "@types/yargs": "~17.0.35"
-   },
-   "bundleDependencies": [
-      "@jspm/core"
-   ]
+{
+   "name": "@jointhedots/gear",
+   "version": "1.2.3",
+   "type": "module",
+   "packageManager": "pnpm@10.30.3",
+   "bin": {
+      "jointhedots-gear": "esm/cli.js"
+   },
+   "exports": {
+      "./workspace": "./esm/workspace/mod.js",
+      "./core": {
+         "browser": "./esm/core/mod-browser.js",
+         "node": "./esm/core/mod-node.js",
+         "deno": "./src/core/mod.ts",
+         "default": "./esm/core/mod.js"
+      }
+   },
+   "files": [
+      "esm",
+      "browser-modules",
+      "schemas",
+      "!**/*.map"
+   ],
+   "scripts": {
+      "watch": "tsc -w --sourceMap",
+      "build": "tsc",
+      ":serve": "deno --allow-all --watch=src src/cli.ts serve --app playground:agent --devmode --port 3001 --ws ../jointhedots-core/packages/jointhedots-agent",
+      ":build:core": "deno --allow-all --watch=src src/cli.ts make --buns jointhedots.core --devmode --ws ../jointhedots-core/packages/jointhedots-core",
+      ":build:ui": "deno --allow-all --watch=src src/cli.ts make --buns jointhedots.ui --ws ../jointhedots-core/packages/jointhedots-ui",
+      ":build:cortex": "deno --allow-all --watch=src src/cli.ts make --buns @jointhedots/cortex --devmode --ws ../jointhedots-core/packages/jointhedots-cortex",
+      ":build:libs": "deno --allow-all --watch=src src/cli.ts make --libs @jointhedots/core,@jointhedots/ui --devmode --ws ../jointhedots-core",
+      ":build:lib:core": "deno --allow-all --watch=src src/cli.ts make --libs @jointhedots/core --devmode --ws ../jointhedots-core/packages/jointhedots-core",
+      ":build:lib:ui": "deno --allow-all --watch=src src/cli.ts make --libs @jointhedots/ui --devmode --ws ../jointhedots-core/packages/jointhedots-ui",
+      ":build:app": "deno --allow-all --watch=src src/cli.ts make --apps playground:ui --ws ../jointhedots-core",
+      "serve:mono": "deno --allow-all --watch=src src/cli.ts serve --app playground:ui --devmode --port 3002 --ws ../jointhedots-core",
+      "serve:host": "deno --allow-all --watch=src src/cli.ts serve --app playground:ui:host --devmode --port 3002 --ws ../jointhedots-core",
+      "serve:sfe": "deno --allow-all --watch=src src/cli.ts serve --app sfe-webapp --devmode --ws ../sf-explorer-app",
+      "serve:demo": "deno --allow-all --watch=src src/cli.ts serve --app sfe-demo --devmode --ws ../sf-explorer-demo",
+      "make:sfe": "deno --allow-all --watch=src src/cli.ts make --libs @sf-explorer/app --devmode --ws ../sf-explorer-app",
+      "prepublishOnly": "node scripts/prepublish.mjs"
+   },
+   "dependencies": {
+      "@jspm/core": "^2.1.0",
+      "@tailwindcss/postcss": "~4.1.3",
+      "@typescript/native-preview": "^7.0.0-dev.20260310.1",
+      "dotenv": "~17.2.3",
+      "esbuild": "~0.27.2",
+      "esbuild-sass-plugin": "~3.6.0",
+      "express": "~5.2.1",
+      "json-schema": "^0.4.0",
+      "mime": "~4.1.0",
+      "postcss": "~8.5.6",
+      "sass": "~1.97.2",
+      "semver": "~7.7.3",
+      "sharp": "~0.34.5",
+      "toml": "^3.0.0",
+      "typescript": "~5.9.3",
+      "vscode-uri": "^3.1.0",
+      "yaml": "^2.8.2",
+      "yargs": "~18.0.0",
+      "zod": "^4.3.6"
+   },
+   "devDependencies": {
+      "@polycuber/script.cli": "~1.0.5",
+      "@types/chrome": "~0.1.33",
+      "@types/node": "~22.7.4",
+      "@types/semver": "~7.7.1",
+      "@types/web-app-manifest": "~1.0.9",
+      "@types/yargs": "~17.0.35"
+   },
+   "bundleDependencies": [
+      "@deno/esbuild-plugin",
+      "@jspm/core"
+   ]
 }