@larkiny/astro-github-loader 0.9.0 → 0.10.1

package/dist/github.content.js

@@ -3,7 +3,6 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 import path, { join, dirname, basename, extname } from "node:path";
 import picomatch from "picomatch";
 import { globalLinkTransform, generateAutoLinkMappings } from "./github.link-transform.js";
-import { getLatestCommitInfo, loadImportState, createConfigId } from "./github.dryrun.js";
 import { INVALID_SERVICE_RESPONSE, INVALID_STRING_ERROR, INVALID_URL_ERROR, } from "./github.constants.js";
 /**
  * Generates a unique identifier from a file path by removing the extension
@@ -556,42 +555,6 @@ export async function toCollectionEntry({ context, octokit, options, signal, for
         throw new TypeError(INVALID_STRING_ERROR);
     // Get logger from context - it should be our Logger instance (initialize early)
     const logger = context.logger;
-    // Repository-level caching - simple all-or-nothing approach
-    const configName = options.name || `${owner}/${repo}`;
-    const configId = createConfigId(options);
-    if (!force) {
-        try {
-            const state = await loadImportState(process.cwd());
-            const currentState = state.imports[configId];
-            if (currentState && currentState.lastCommitSha) {
-                logger.debug(`🔍 Checking repository changes for ${configName}...`);
-                const latestCommit = await getLatestCommitInfo(octokit, options, signal);
-                if (latestCommit && currentState.lastCommitSha === latestCommit.sha) {
-                    logger.info(`✅ Repository ${configName} unchanged (${latestCommit.sha.slice(0, 7)}) - skipping import`);
-                    return {
-                        processed: 0,
-                        updated: 0,
-                        unchanged: 0,
-                        assetsDownloaded: 0,
-                        assetsCached: 0,
-                    };
-                }
-                else if (latestCommit) {
-                    logger.info(`🔄 Repository ${configName} changed (${currentState.lastCommitSha?.slice(0, 7) || 'unknown'} -> ${latestCommit.sha.slice(0, 7)}) - proceeding with import`);
-                }
-            }
-            else {
-                logger.debug(`📥 First time importing ${configName} - no previous state found`);
-            }
-        }
-        catch (error) {
-            logger.warn(`Failed to check repository state for ${configName}: ${error instanceof Error ? error.message : String(error)}`);
-            // Continue with import if state check fails
-        }
-    }
-    else {
-        logger.info(`🔄 Force mode enabled for ${configName} - proceeding with full import`);
-    }
     // Get all unique directory prefixes from include patterns to limit scanning
     const directoriesToScan = new Set();
     if (options.includes && options.includes.length > 0) {

package/dist/github.loader.js

@@ -1,6 +1,6 @@
 import { toCollectionEntry } from "./github.content.js";
 import { performSelectiveCleanup } from "./github.cleanup.js";
-import { performDryRun, displayDryRunResults, updateImportState } from "./github.dryrun.js";
+import { performDryRun, displayDryRunResults, updateImportState, loadImportState, createConfigId, getLatestCommitInfo } from "./github.dryrun.js";
 import { createLogger } from "./github.logger.js";
 /**
  * Performs selective cleanup for configurations with basePath
@@ -95,6 +95,42 @@ export function githubLoader({ octokit, configs, fetchOptions = {}, clear = fals
                 };
                 const startTime = Date.now();
                 try {
+                    // Repository-level caching check before spinner
+                    const configId = createConfigId(config);
+                    if (!force) {
+                        try {
+                            const state = await loadImportState(process.cwd());
+                            const currentState = state.imports[configId];
+                            if (currentState && currentState.lastCommitSha) {
+                                configLogger.debug(`🔍 Checking repository changes for ${configName}...`);
+                                const latestCommit = await getLatestCommitInfo(octokit, config);
+                                if (latestCommit && currentState.lastCommitSha === latestCommit.sha) {
+                                    configLogger.info(`✅ Repository ${configName} unchanged (${latestCommit.sha.slice(0, 7)}) - skipping import`);
+                                    // Update summary for unchanged repository
+                                    summary.duration = Date.now() - startTime;
+                                    summary.filesProcessed = 0;
+                                    summary.filesUpdated = 0;
+                                    summary.filesUnchanged = 0;
+                                    summary.status = 'success';
+                                    configLogger.logImportSummary(summary);
+                                    continue; // Skip to next config
+                                }
+                                else if (latestCommit) {
+                                    configLogger.info(`🔄 Repository ${configName} changed (${currentState.lastCommitSha?.slice(0, 7) || 'unknown'} -> ${latestCommit.sha.slice(0, 7)}) - proceeding with import`);
+                                }
+                            }
+                            else {
+                                configLogger.debug(`📥 First time importing ${configName} - no previous state found`);
+                            }
+                        }
+                        catch (error) {
+                            configLogger.warn(`Failed to check repository state for ${configName}: ${error instanceof Error ? error.message : String(error)}`);
+                            // Continue with import if state check fails
+                        }
+                    }
+                    else {
+                        configLogger.info(`🔄 Force mode enabled for ${configName} - proceeding with full import`);
+                    }
                     // Perform the import with spinner
                     const stats = await globalLogger.withSpinner(`🔄 Importing ${configName}...`, () => toCollectionEntry({
                         context: { ...context, logger: configLogger },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@larkiny/astro-github-loader",
   "type": "module",
-  "version": "0.9.0",
+  "version": "0.10.1",
   "description": "Load content from GitHub repositories into Astro content collections with asset management and content transformations",
   "keywords": [
     "astro",
@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "github-slugger": "^2.0.0",
-    "octokit": "^4.1.2",
+    "octokit": "^5.0.4",
     "picomatch": "^4.0.2"
   },
   "peerDependencies": {

package/src/github.content.ts

@@ -4,7 +4,6 @@ import path, { join, dirname, basename, extname } from "node:path";
 import picomatch from "picomatch";
 import { globalLinkTransform, generateAutoLinkMappings, type ImportedFile } from "./github.link-transform.js";
 import type { Logger } from "./github.logger.js";
-import { getLatestCommitInfo, loadImportState, createConfigId } from "./github.dryrun.js";
 
 import {
   INVALID_SERVICE_RESPONSE,
@@ -663,41 +662,6 @@ export async function toCollectionEntry({
   // Get logger from context - it should be our Logger instance (initialize early)
   const logger = context.logger as unknown as Logger;
 
-  // Repository-level caching - simple all-or-nothing approach
-  const configName = options.name || `${owner}/${repo}`;
-  const configId = createConfigId(options);
-
-  if (!force) {
-    try {
-      const state = await loadImportState(process.cwd());
-      const currentState = state.imports[configId];
-
-      if (currentState && currentState.lastCommitSha) {
-        logger.debug(`🔍 Checking repository changes for ${configName}...`);
-        const latestCommit = await getLatestCommitInfo(octokit, options, signal);
-
-        if (latestCommit && currentState.lastCommitSha === latestCommit.sha) {
-          logger.info(`✅ Repository ${configName} unchanged (${latestCommit.sha.slice(0, 7)}) - skipping import`);
-          return {
-            processed: 0,
-            updated: 0,
-            unchanged: 0,
-            assetsDownloaded: 0,
-            assetsCached: 0,
-          };
-        } else if (latestCommit) {
-          logger.info(`🔄 Repository ${configName} changed (${currentState.lastCommitSha?.slice(0, 7) || 'unknown'} -> ${latestCommit.sha.slice(0, 7)}) - proceeding with import`);
-        }
-      } else {
-        logger.debug(`📥 First time importing ${configName} - no previous state found`);
-      }
-    } catch (error) {
-      logger.warn(`Failed to check repository state for ${configName}: ${error instanceof Error ? error.message : String(error)}`);
-      // Continue with import if state check fails
-    }
-  } else {
-    logger.info(`🔄 Force mode enabled for ${configName} - proceeding with full import`);
-  }
 
   // Get all unique directory prefixes from include patterns to limit scanning
   const directoriesToScan = new Set<string>();

package/src/github.loader.ts

@@ -1,6 +1,6 @@
 import { toCollectionEntry } from "./github.content.js";
 import { performSelectiveCleanup } from "./github.cleanup.js";
-import { performDryRun, displayDryRunResults, updateImportState } from "./github.dryrun.js";
+import { performDryRun, displayDryRunResults, updateImportState, loadImportState, createConfigId, getLatestCommitInfo } from "./github.dryrun.js";
 import { createLogger, type Logger, type ImportSummary } from "./github.logger.js";
 
 import type {
@@ -133,6 +133,44 @@ export function githubLoader({
         const startTime = Date.now();
 
         try {
+          // Repository-level caching check before spinner
+          const configId = createConfigId(config);
+
+          if (!force) {
+            try {
+              const state = await loadImportState(process.cwd());
+              const currentState = state.imports[configId];
+
+              if (currentState && currentState.lastCommitSha) {
+                configLogger.debug(`🔍 Checking repository changes for ${configName}...`);
+                const latestCommit = await getLatestCommitInfo(octokit, config);
+
+                if (latestCommit && currentState.lastCommitSha === latestCommit.sha) {
+                  configLogger.info(`✅ Repository ${configName} unchanged (${latestCommit.sha.slice(0, 7)}) - skipping import`);
+
+                  // Update summary for unchanged repository
+                  summary.duration = Date.now() - startTime;
+                  summary.filesProcessed = 0;
+                  summary.filesUpdated = 0;
+                  summary.filesUnchanged = 0;
+                  summary.status = 'success';
+
+                  configLogger.logImportSummary(summary);
+                  continue; // Skip to next config
+                } else if (latestCommit) {
+                  configLogger.info(`🔄 Repository ${configName} changed (${currentState.lastCommitSha?.slice(0, 7) || 'unknown'} -> ${latestCommit.sha.slice(0, 7)}) - proceeding with import`);
+                }
+              } else {
+                configLogger.debug(`📥 First time importing ${configName} - no previous state found`);
+              }
+            } catch (error) {
+              configLogger.warn(`Failed to check repository state for ${configName}: ${error instanceof Error ? error.message : String(error)}`);
+              // Continue with import if state check fails
+            }
+          } else {
+            configLogger.info(`🔄 Force mode enabled for ${configName} - proceeding with full import`);
+          }
+
           // Perform the import with spinner
           const stats = await globalLogger.withSpinner(
             `🔄 Importing ${configName}...`,