hologit 0.46.1 → 0.47.0

package/bin/cli.js

@@ -21,7 +21,7 @@ module.exports = { logger };
 
 
 // route command line
-require('yargs')
+require('yargs')(process.argv.slice(2))
     .version(require('../package.json').version)
     .option('d', {
         alias: 'debug',
@@ -58,4 +58,4 @@ require('yargs')
     })
     .strict()
     .help()
-    .argv;
+    .parse();

package/commands/project.js

@@ -10,6 +10,11 @@ exports.builder = {
         describe: 'A commit message to use if commit-branch is specified',
         type: 'string'
     },
+    'commit-source-parent': {
+        describe: 'Include the source commit as a second parent in the projection commit',
+        type: 'boolean',
+        default: true
+    },
     'ref': {
         describe: 'Commit ref to read holobranch from',
         default: 'HEAD'
@@ -53,6 +58,7 @@ exports.handler = async function project ({
     watch = false,
     commitTo = null,
     commitMessage = null,
+    commitSourceParent = true,
     cacheFrom = null,
     cacheTo = null
 }) {
@@ -136,7 +142,7 @@ exports.handler = async function project ({
         lens,
         commitTo,
         commitMessage,
-        parentCommit,
+        parentCommit: commitSourceParent ? parentCommit : null,
         fetch,
         cacheFrom,
         cacheTo
@@ -156,7 +162,7 @@ exports.handler = async function project ({
                     lens,
                     commitTo,
                     commitMessage,
-                    parentCommit: newCommitHash,
+                    parentCommit: commitSourceParent ? newCommitHash : null,
                     cacheFrom,
                     cacheTo
                 });

package/jest.config.js

@@ -0,0 +1,7 @@
+module.exports = {
+    testEnvironment: 'node',
+    testMatch: ['**/test/**/*.test.js'],
+    testPathIgnorePatterns: ['/node_modules/'],
+    setupFilesAfterEnv: ['<rootDir>/test/setup.js'],
+    testTimeout: 30000, // Git operations can be slow
+};

package/lib/Lens.js

@@ -110,33 +110,46 @@ class Lens extends Configurable {
         }
     }
 
-    async buildSpecForContainer (inputTree, config) {
-        const { container: containerQuery } = config;
-
-        // check if image exists locally first
-        let imageHash;
+    async getImageHash (containerQuery) {
+        // Try local first (fastest)
         try {
             const inspectOutput = await Studio.execDocker(['inspect', containerQuery]);
             const imageInfo = JSON.parse(inspectOutput)[0];
-            imageHash = imageInfo.Id;
-            logger.info(`found local image: ${containerQuery}@${imageHash}`);
+            logger.info(`found local image: ${containerQuery}@${imageInfo.Id}`);
+            return { hash: imageInfo.Id, isLocal: true };
         } catch (err) {
-            // image doesn't exist locally or can't be inspected, try pulling
-            logger.info(`pulling image: ${containerQuery}`);
-
-            try {
-                await Studio.execDocker(['pull', containerQuery], { $relayStdout: true });
-                const inspectOutput = await Studio.execDocker(['inspect', containerQuery]);
-                const imageInfo = JSON.parse(inspectOutput)[0];
-                imageHash = imageInfo.Id;
-            } catch (err) {
-                throw new Error(`failed to pull container image ${containerQuery}: ${err.message}`);
-            }
+            // Not found locally, try remote manifest
         }
 
-        if (!imageHash) {
-            throw new Error(`failed to get hash for container image ${containerQuery}`);
+        // Try remote manifest (doesn't pull the image)
+        try {
+            logger.info(`querying remote manifest for: ${containerQuery}`);
+            const manifestOutput = await Studio.execDocker(['manifest', 'inspect', containerQuery]);
+            const manifest = JSON.parse(manifestOutput);
+
+            // Extract digest from manifest
+            // For multi-arch images, manifest.config.digest contains the config digest
+            // For single-arch images, we may need to look at the digest field
+            const digest = manifest.config?.digest || manifest.digest;
+
+            if (!digest) {
+                throw new Error('No digest found in manifest');
+            }
+
+            // Ensure the digest is in the format sha256:...
+            const imageHash = digest.startsWith('sha256:') ? digest : `sha256:${digest}`;
+            logger.info(`found remote image hash: ${containerQuery}@${imageHash}`);
+            return { hash: imageHash, isLocal: false };
+        } catch (err) {
+            throw new Error(`failed to get hash for container image ${containerQuery}: ${err.message}`);
         }
+    }
+
+    async buildSpecForContainer (inputTree, config) {
+        const { container: containerQuery } = config;
+
+        // Get image hash without pulling
+        const { hash: imageHash, isLocal } = await this.getImageHash(containerQuery);
 
         // build spec
         const data = {
@@ -152,7 +165,8 @@ class Lens extends Configurable {
         return {
             ...await SpecObject.write(this.workspace.getRepo(), 'lens', data),
             data,
-            type: 'container'
+            type: 'container',
+            imageIsLocal: isLocal
         };
     }
 
@@ -317,6 +331,26 @@ class Lens extends Configurable {
         }
         const [, sha256Hash] = containerMatch;
 
+        // Ensure image is available locally
+        try {
+            await Studio.execDocker(['inspect', sha256Hash]);
+        } catch (err) {
+            // Image not found locally, need to pull it
+            // Extract the original container query from spec to pull by name:tag
+            const containerQueryMatch = spec.container.match(/^(.+)@sha256:[a-f0-9]{64}$/);
+            if (containerQueryMatch) {
+                const containerQuery = containerQueryMatch[1];
+                logger.info(`pulling required image: ${containerQuery}`);
+                try {
+                    await Studio.execDocker(['pull', containerQuery], { $relayStdout: true });
+                } catch (pullErr) {
+                    throw new Error(`failed to pull container image ${containerQuery}: ${pullErr.message}`);
+                }
+            } else {
+                throw new Error(`cannot extract container query from spec.container: ${spec.container}`);
+            }
+        }
+
         // create and start container
         const persistentDebugContainer = process.env.HOLO_DEBUG_PERSIST_CONTAINER;
         let containerId;

package/lib/Repo.js

@@ -196,7 +196,7 @@ class Repo {
     }
 
     async watch ({ callback }) {
-        const debounce = require('debounce');
+        const { default: debounce } = await import('debounce');
         const logger = require('../lib/logger.js');
 
 
@@ -313,7 +313,7 @@ class Repo {
                 cancel
             };
         } else {
-            const chokidar = require('chokidar');
+            const { default: chokidar } = await import('chokidar');
             const watcher = chokidar.watch([], {
                 persistent: true,
                 cwd: this.gitDir,

package/lib/SpecObject.js

@@ -1,4 +1,3 @@
-const sortKeys = require('sort-keys');
 const TOML = require('@iarna/toml');
 
 
@@ -8,7 +7,8 @@ const BlobObject = require('./BlobObject.js');
 class SpecObject extends BlobObject {
 
     static async write (repo, kind, data) {
-        // build ordered spec object
+        // build ordered spec object (sort-keys is ESM-only, requires dynamic import)
+        const { default: sortKeys } = await import('sort-keys');
         const holospec = {};
         holospec[kind] = sortKeys(data, { deep: true });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hologit",
-  "version": "0.46.1",
+  "version": "0.47.0",
   "description": "Hologit automates the projection of layered composite file trees based on flat, declarative plans",
   "repository": "https://github.com/EmergencePlatform/hologit",
   "main": "lib/index.js",
@@ -11,29 +11,29 @@
   "dependencies": {
     "@iarna/toml": "^2.2.5",
     "async-exit-hook": "^2.0.1",
-    "axios": "^1.7.7",
-    "chokidar": "^4.0.1",
-    "debounce": "^2.0.0",
-    "fb-watchman": "^2.0.1",
+    "axios": "^1.13.2",
+    "chokidar": "^5.0.0",
+    "debounce": "^3.0.0",
+    "fb-watchman": "^2.0.2",
     "git-client": "^1.9.4",
     "hab-client": "^1.1.3",
-    "handlebars": "^4.7.6",
-    "minimatch": "^10.0.1",
-    "mz": "^2.4.0",
+    "handlebars": "^4.7.8",
+    "minimatch": "^10.1.1",
+    "mz": "^2.7.0",
     "mz-modules": "^2.1.0",
     "object-squish": "^1.1.0",
-    "parse-url": "^9.2.0",
+    "parse-url": "^10.0.3",
     "shell-quote-word": "^1.0.1",
-    "sort-keys": "^4.2.0",
+    "sort-keys": "^6.0.0",
     "toposort": "^2.0.2",
-    "winston": "^3.17.0",
-    "yargs": "^17.5.1"
+    "winston": "^3.19.0",
+    "yargs": "^18.0.0"
   },
   "bin": {
     "git-holo": "./bin/cli.js"
   },
   "engines": {
-    "node": ">=8.3.0"
+    "node": "^20.19.0 || ^22.12.0 || >=23"
   },
   "os": [
     "darwin",
@@ -48,11 +48,8 @@
     "projection"
   ],
   "devDependencies": {
-    "@types/jest": "^29.1.2",
-    "jest": "^29.5.0"
-  },
-  "jest": {
-    "testEnvironment": "node"
+    "@types/jest": "^30.0.0",
+    "jest": "^30.2.0"
   },
   "scripts": {
     "test": "jest"