@larkiny/astro-github-loader 0.11.2 → 0.11.3

package/README.md

@@ -584,17 +584,52 @@ const REMOTE_CONTENT_WITH_ASSETS: ImportOptions[] = [
 
 ## File Management Strategy
 
-> **⚠️ Important: Do not use `clear: true`**
->
-> The `clear: true` option should not be used with the current implementation due to how Astro content collection syncing works. Mass file deletions can cause Astro to invalidate entire content collections, leading to 404 errors and build instability.
->
-> **Instead**: If you need to handle file deletions, renames, or path restructuring from the source repository:
->
-> 1. Manually delete the local import folders (e.g., `src/content/docs/imported`)
-> 2. Re-run the import process
-> 3. Fresh content will be imported with the new structure
->
-> This approach ensures your site remains stable while handling structural changes.
+The `clear` option enables selective replacement of content collection entries during import. When enabled, existing entries are atomically replaced (deleted then re-added) one at a time, preserving content collection stability.
+
+### Using the Clear Option
+
+```typescript
+// Per-config clear (recommended)
+const REMOTE_CONTENT: ImportOptions[] = [
+  {
+    name: "Docs that need clearing",
+    owner: "your-org",
+    repo: "docs-repo",
+    clear: true,  // Enable clearing for this config only
+    includes: [
+      { pattern: "docs/**/*.md", basePath: "src/content/docs/imported" }
+    ],
+  },
+  {
+    name: "Docs that don't need clearing",
+    owner: "your-org",
+    repo: "other-docs",
+    clear: false,  // Explicitly disable (or omit for default behavior)
+    includes: [
+      { pattern: "guides/**/*.md", basePath: "src/content/docs/guides" }
+    ],
+  },
+];
+
+// Or use global clear with per-config override
+await githubLoader({
+  octokit,
+  configs: REMOTE_CONTENT,
+  clear: true,  // Global default - can be overridden per-config
+}).load(context);
+```
+
+### When to Use Clear
+
+- **Use `clear: true`** when you need to ensure stale entries are removed (e.g., files renamed or deleted in the source repo)
+- **Use `clear: false`** (default) for incremental updates where you want to preserve existing entries
+
+### How It Works
+
+Unlike a bulk clear operation, the loader uses a selective delete-before-set approach:
+1. For each file being imported, if an entry already exists, it's deleted immediately before the new entry is added
+2. This atomic replacement ensures the content collection is never empty
+3. Astro's content collection system handles individual deletions gracefully
 
 ## Change Detection & Dry-Run Mode
 

package/dist/github.content.d.ts

@@ -111,7 +111,7 @@ export declare function syncEntry(context: LoaderContext, { url, editUrl }: {
  * Handles both files and directories, recursively processing directories if needed.
  * @internal
  */
-export declare function toCollectionEntry({ context, octokit, options, signal, force, }: CollectionEntryOptions): Promise<ImportStats>;
+export declare function toCollectionEntry({ context, octokit, options, signal, force, clear, }: CollectionEntryOptions): Promise<ImportStats>;
 /**
  * Get the headers needed to make a conditional request.
  * Uses the etag and last-modified values from the meta store.

package/dist/github.content.js

@@ -549,7 +549,7 @@ export async function syncEntry(context, { url, editUrl }, filePath, options, oc
  * Handles both files and directories, recursively processing directories if needed.
  * @internal
  */
-export async function toCollectionEntry({ context, octokit, options, signal, force = false, }) {
+export async function toCollectionEntry({ context, octokit, options, signal, force = false, clear = false, }) {
     const { owner, repo, ref = "main" } = options || {};
     if (typeof repo !== "string" || typeof owner !== "string")
         throw new TypeError(INVALID_STRING_ERROR);
@@ -654,7 +654,7 @@ export async function toCollectionEntry({ context, octokit, options, signal, for
     stats.processed = processedFiles.length;
     for (const file of processedFiles) {
         logger.logFileProcessing("Storing", file.sourcePath);
-        const result = await storeProcessedFile(file, context, options);
+        const result = await storeProcessedFile(file, context, clear);
         if (result) {
             stats.updated++;
         }
@@ -796,7 +796,7 @@ export async function toCollectionEntry({ context, octokit, options, signal, for
         };
     }
     // Helper function to store a processed file
-    async function storeProcessedFile(file, context, options) {
+    async function storeProcessedFile(file, context, clear) {
         const { store, generateDigest, entryTypes, logger, parseData, config } = context;
         function configForFile(filePath) {
             const ext = filePath.split(".").at(-1);
@@ -833,6 +833,13 @@ export async function toCollectionEntry({ context, octokit, options, signal, for
             data,
             filePath: fileUrl.toString(),
         });
+        // When clear mode is enabled, delete the existing entry before setting the new one.
+        // This provides atomic replacement without breaking Astro's content collection,
+        // as opposed to calling store.clear() which empties everything at once.
+        if (clear && existingEntry) {
+            logger.debug(`🗑️ Clearing existing entry before replacement: ${file.id}`);
+            store.delete(file.id);
+        }
         // Store in content store
         if (entryType.getRenderFunction) {
             logger.verbose(`Rendering ${file.id}`);

package/dist/github.loader.js

@@ -44,7 +44,6 @@ export function githubLoader({ octokit, configs, fetchOptions = {}, clear = fals
     return {
         name: "github-loader",
         load: async (context) => {
-            const { store } = context;
             // Create global logger with specified level or default
             const globalLogger = createLogger(logLevel || 'default');
             if (dryRun) {
@@ -62,11 +61,9 @@ export function githubLoader({ octokit, configs, fetchOptions = {}, clear = fals
                 }
             }
             globalLogger.debug(`Loading data from ${configs.length} sources`);
-            // Always use standard processing - no file deletions to avoid Astro issues
-            globalLogger.info(clear ? "Processing with content store clear" : "Processing without content store clear");
-            if (clear) {
-                store.clear();
-            }
+            // Log clear mode status - actual clearing happens per-entry in toCollectionEntry
+            // to avoid breaking Astro's content collection by emptying the store all at once
+            globalLogger.info(clear ? "Processing with selective entry replacement" : "Processing without entry replacement");
             // Process each config sequentially to avoid overwhelming GitHub API/CDN
             for (let i = 0; i < configs.length; i++) {
                 const config = configs[i];
@@ -131,6 +128,18 @@ export function githubLoader({ octokit, configs, fetchOptions = {}, clear = fals
                     else {
                         configLogger.info(`🔄 Force mode enabled for ${configName} - proceeding with full import`);
                     }
+                    // Determine effective clear setting: per-config takes precedence over global
+                    const effectiveClear = config.clear ?? clear;
+                    // Perform selective cleanup before importing if clear is enabled
+                    if (effectiveClear) {
+                        configLogger.info(`🧹 Clearing obsolete files for ${configName}...`);
+                        try {
+                            await performSelectiveCleanup(config, { ...context, logger: configLogger }, octokit);
+                        }
+                        catch (error) {
+                            configLogger.warn(`Cleanup failed for ${configName}, continuing with import: ${error}`);
+                        }
+                    }
                     // Perform the import with spinner
                     const stats = await globalLogger.withSpinner(`🔄 Importing ${configName}...`, () => toCollectionEntry({
                         context: { ...context, logger: configLogger },
@@ -138,6 +147,7 @@ export function githubLoader({ octokit, configs, fetchOptions = {}, clear = fals
                         options: config,
                         fetchOptions,
                         force,
+                        clear: effectiveClear,
                     }), `✅ ${configName} imported successfully`, `❌ ${configName} import failed`);
                     summary.duration = Date.now() - startTime;
                     summary.filesProcessed = stats?.processed || 0;

package/dist/github.types.d.ts

@@ -199,6 +199,13 @@ export type CollectionEntryOptions = {
      * @default false
      */
     force?: boolean;
+    /**
+     * When true, deletes existing store entries before setting new ones.
+     * This enables atomic replacement of entries without breaking the content collection.
+     * Passed from GithubLoaderOptions.clear
+     * @internal
+     */
+    clear?: boolean;
 };
 /**
  * Interface representing rendered content, including HTML and associated metadata.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@larkiny/astro-github-loader",
   "type": "module",
-  "version": "0.11.2",
+  "version": "0.11.3",
   "description": "Load content from GitHub repositories into Astro content collections with asset management and content transformations",
   "keywords": [
     "astro",

package/src/github.content.ts

@@ -654,6 +654,7 @@ export async function toCollectionEntry({
   options,
   signal,
   force = false,
+  clear = false,
 }: CollectionEntryOptions): Promise<ImportStats> {
   const { owner, repo, ref = "main" } = options || {};
   if (typeof repo !== "string" || typeof owner !== "string")
@@ -782,7 +783,7 @@ export async function toCollectionEntry({
   stats.processed = processedFiles.length;
   for (const file of processedFiles) {
     logger.logFileProcessing("Storing", file.sourcePath);
-    const result = await storeProcessedFile(file, context, options);
+    const result = await storeProcessedFile(file, context, clear);
     if (result) {
       stats.updated++;
     } else {
@@ -944,7 +945,7 @@ export async function toCollectionEntry({
   async function storeProcessedFile(
     file: ImportedFile,
     context: any,
-    options: ImportOptions
+    clear: boolean
   ): Promise<any> {
     const { store, generateDigest, entryTypes, logger, parseData, config } = context;
 
@@ -988,6 +989,14 @@ export async function toCollectionEntry({
       filePath: fileUrl.toString(),
     });
 
+    // When clear mode is enabled, delete the existing entry before setting the new one.
+    // This provides atomic replacement without breaking Astro's content collection,
+    // as opposed to calling store.clear() which empties everything at once.
+    if (clear && existingEntry) {
+      logger.debug(`🗑️ Clearing existing entry before replacement: ${file.id}`);
+      store.delete(file.id);
+    }
+
     // Store in content store
     if (entryType.getRenderFunction) {
       logger.verbose(`Rendering ${file.id}`);

package/src/github.loader.ts

@@ -67,7 +67,6 @@ export function githubLoader({
   return {
     name: "github-loader",
     load: async (context) => {
-      const { store } = context;
 
       // Create global logger with specified level or default
       const globalLogger = createLogger(logLevel || 'default');
@@ -91,12 +90,9 @@ export function githubLoader({
 
       globalLogger.debug(`Loading data from ${configs.length} sources`);
 
-      // Always use standard processing - no file deletions to avoid Astro issues
-      globalLogger.info(clear ? "Processing with content store clear" : "Processing without content store clear");
-
-      if (clear) {
-        store.clear();
-      }
+      // Log clear mode status - actual clearing happens per-entry in toCollectionEntry
+      // to avoid breaking Astro's content collection by emptying the store all at once
+      globalLogger.info(clear ? "Processing with selective entry replacement" : "Processing without entry replacement");
 
       // Process each config sequentially to avoid overwhelming GitHub API/CDN
       for (let i = 0; i < configs.length; i++) {
@@ -171,6 +167,19 @@ export function githubLoader({
             configLogger.info(`🔄 Force mode enabled for ${configName} - proceeding with full import`);
           }
 
+          // Determine effective clear setting: per-config takes precedence over global
+          const effectiveClear = config.clear ?? clear;
+
+          // Perform selective cleanup before importing if clear is enabled
+          if (effectiveClear) {
+            configLogger.info(`🧹 Clearing obsolete files for ${configName}...`);
+            try {
+              await performSelectiveCleanup(config, { ...context, logger: configLogger as any }, octokit);
+            } catch (error) {
+              configLogger.warn(`Cleanup failed for ${configName}, continuing with import: ${error}`);
+            }
+          }
+
           // Perform the import with spinner
           const stats = await globalLogger.withSpinner(
             `🔄 Importing ${configName}...`,
@@ -180,6 +189,7 @@ export function githubLoader({
               options: config,
               fetchOptions,
               force,
+              clear: effectiveClear,
             }),
             `✅ ${configName} imported successfully`,
             `❌ ${configName} import failed`

package/src/github.types.ts

@@ -216,6 +216,13 @@ export type CollectionEntryOptions = {
    * @default false
    */
   force?: boolean;
+  /**
+   * When true, deletes existing store entries before setting new ones.
+   * This enables atomic replacement of entries without breaking the content collection.
+   * Passed from GithubLoaderOptions.clear
+   * @internal
+   */
+  clear?: boolean;
 };
 
 /**