@ibalzam/codejitsu-core 0.3.2 → 0.3.3

package/modules/blog/src/collection.d.ts

@@ -4,28 +4,14 @@ export interface CollectionBlogConfig extends CommonBlogConfig {
     collectionName?: string;
 }
 /**
- * Astro Content Collections blog loader. Use this in Astro projects.
+ * Astro Content Collections blog loader. Use in any Astro project.
  *
- * Returns raw CollectionEntry objects (preserving `entry.data`, `entry.id`,
- * and the ability to call `render(entry)` from astro:content). Filtering and
- * sorting are applied:
- *   - Drafts excluded (when `draftField` is set)
- *   - Sorted newest first by `dateField`
- *   - `getPublishedEntries()` further excludes future-dated entries
+ * Returns raw CollectionEntry objects with filtering applied (drafts excluded,
+ * sorted newest first by `dateField`). Preserves `entry.data`, `entry.id`,
+ * and the ability to call `render(entry)` for `<Content />`.
  *
- * The collection's actual entry type is `CollectionEntry<'<name>'>` from
- * `astro:content`. Pass it as the generic to get full typed `data`:
- *
- * ```ts
- * import type { CollectionEntry } from 'astro:content';
- * export const blog = createBlogFromCollection<CollectionEntry<'blog'>>({
- *   collectionName: 'blog',
- *   dateField: 'pubDate',
- *   draftField: 'draft',
- * });
- * ```
- *
- * Dynamically imports `astro:content` at call time so the package stays
- * usable in non-Astro projects.
+ * Import only from inside Astro code (`src/lib/blog.ts`, page routes). Do not
+ * import from `astro.config.mjs` — Astro CC isn't initialized at config time.
+ * Use `createBlog` (fs) for astro.config.
  */
 export declare function createBlogFromCollection<E extends BlogCollectionEntry = BlogCollectionEntry>(config?: CollectionBlogConfig): BlogCollectionAPI<E>;

package/modules/blog/src/collection.js

@@ -1,3 +1,9 @@
+// @ts-expect-error - 'astro:content' is a virtual module resolved by Astro at build time.
+// Static import (not dynamic) so Vite/Astro processes the dependency correctly.
+// This file is only safe to import from inside an Astro project. It lives at the
+// `/blog/collection` subpath; sites that aren't Astro should import from `/blog`
+// (which doesn't pull this in).
+import { getCollection as astroGetCollection } from 'astro:content';
 import readingTime from 'reading-time';
 function getTodayUTC() {
     const now = new Date();
@@ -20,29 +26,15 @@ function asDate(value) {
     return null;
 }
 /**
- * Astro Content Collections blog loader. Use this in Astro projects.
+ * Astro Content Collections blog loader. Use in any Astro project.
  *
- * Returns raw CollectionEntry objects (preserving `entry.data`, `entry.id`,
- * and the ability to call `render(entry)` from astro:content). Filtering and
- * sorting are applied:
- *   - Drafts excluded (when `draftField` is set)
- *   - Sorted newest first by `dateField`
- *   - `getPublishedEntries()` further excludes future-dated entries
+ * Returns raw CollectionEntry objects with filtering applied (drafts excluded,
+ * sorted newest first by `dateField`). Preserves `entry.data`, `entry.id`,
+ * and the ability to call `render(entry)` for `<Content />`.
  *
- * The collection's actual entry type is `CollectionEntry<'<name>'>` from
- * `astro:content`. Pass it as the generic to get full typed `data`:
- *
- * ```ts
- * import type { CollectionEntry } from 'astro:content';
- * export const blog = createBlogFromCollection<CollectionEntry<'blog'>>({
- *   collectionName: 'blog',
- *   dateField: 'pubDate',
- *   draftField: 'draft',
- * });
- * ```
- *
- * Dynamically imports `astro:content` at call time so the package stays
- * usable in non-Astro projects.
+ * Import only from inside Astro code (`src/lib/blog.ts`, page routes). Do not
+ * import from `astro.config.mjs` — Astro CC isn't initialized at config time.
+ * Use `createBlog` (fs) for astro.config.
  */
 export function createBlogFromCollection(config = {}) {
     const collectionName = config.collectionName ?? 'blog';
@@ -50,20 +42,8 @@ export function createBlogFromCollection(config = {}) {
     const categories = config.categories ?? [];
     const dateField = config.dateField ?? 'date';
     const draftField = config.draftField ?? null;
-    async function getCollection() {
-        let mod;
-        try {
-            // @ts-expect-error - 'astro:content' is a virtual module resolved by Astro at build time.
-            mod = await import('astro:content');
-        }
-        catch (err) {
-            throw new Error(`createBlogFromCollection() requires Astro and a configured content collection ` +
-                `named '${collectionName}'. Original error: ${err instanceof Error ? err.message : String(err)}`);
-        }
-        return mod.getCollection(collectionName);
-    }
     async function readAll() {
-        const all = await getCollection();
+        const all = (await astroGetCollection(collectionName));
         const filtered = draftField ? all.filter((e) => !e.data[draftField]) : all;
         return filtered.sort((a, b) => {
             const da = asDate(a.data[dateField])?.valueOf() ?? 0;

package/modules/blog/src/collection.ts

@@ -1,3 +1,9 @@
+// @ts-expect-error - 'astro:content' is a virtual module resolved by Astro at build time.
+// Static import (not dynamic) so Vite/Astro processes the dependency correctly.
+// This file is only safe to import from inside an Astro project. It lives at the
+// `/blog/collection` subpath; sites that aren't Astro should import from `/blog`
+// (which doesn't pull this in).
+import { getCollection as astroGetCollection } from 'astro:content';
 import readingTime from 'reading-time';
 import type {
   BlogCategory,
@@ -33,29 +39,15 @@ function asDate(value: unknown): Date | null {
 }
 
 /**
- * Astro Content Collections blog loader. Use this in Astro projects.
+ * Astro Content Collections blog loader. Use in any Astro project.
  *
- * Returns raw CollectionEntry objects (preserving `entry.data`, `entry.id`,
- * and the ability to call `render(entry)` from astro:content). Filtering and
- * sorting are applied:
- *   - Drafts excluded (when `draftField` is set)
- *   - Sorted newest first by `dateField`
- *   - `getPublishedEntries()` further excludes future-dated entries
+ * Returns raw CollectionEntry objects with filtering applied (drafts excluded,
+ * sorted newest first by `dateField`). Preserves `entry.data`, `entry.id`,
+ * and the ability to call `render(entry)` for `<Content />`.
  *
- * The collection's actual entry type is `CollectionEntry<'<name>'>` from
- * `astro:content`. Pass it as the generic to get full typed `data`:
- *
- * ```ts
- * import type { CollectionEntry } from 'astro:content';
- * export const blog = createBlogFromCollection<CollectionEntry<'blog'>>({
- *   collectionName: 'blog',
- *   dateField: 'pubDate',
- *   draftField: 'draft',
- * });
- * ```
- *
- * Dynamically imports `astro:content` at call time so the package stays
- * usable in non-Astro projects.
+ * Import only from inside Astro code (`src/lib/blog.ts`, page routes). Do not
+ * import from `astro.config.mjs` — Astro CC isn't initialized at config time.
+ * Use `createBlog` (fs) for astro.config.
  */
 export function createBlogFromCollection<E extends BlogCollectionEntry = BlogCollectionEntry>(
   config: CollectionBlogConfig = {}
@@ -66,22 +58,8 @@ export function createBlogFromCollection<E extends BlogCollectionEntry = BlogCol
   const dateField = config.dateField ?? 'date';
   const draftField = config.draftField ?? null;
 
-  async function getCollection(): Promise<E[]> {
-    let mod: { getCollection: (name: string) => Promise<E[]> };
-    try {
-      // @ts-expect-error - 'astro:content' is a virtual module resolved by Astro at build time.
-      mod = await import('astro:content');
-    } catch (err) {
-      throw new Error(
-        `createBlogFromCollection() requires Astro and a configured content collection ` +
-          `named '${collectionName}'. Original error: ${err instanceof Error ? err.message : String(err)}`
-      );
-    }
-    return mod.getCollection(collectionName);
-  }
-
   async function readAll(): Promise<E[]> {
-    const all = await getCollection();
+    const all = (await astroGetCollection(collectionName)) as E[];
     const filtered = draftField ? all.filter((e) => !e.data[draftField]) : all;
     return filtered.sort((a, b) => {
       const da = asDate(a.data[dateField])?.valueOf() ?? 0;

package/modules/blog/src/index.d.ts

@@ -1,5 +1,3 @@
 export * from './types.js';
 export { createBlog } from './fs.js';
 export type { FsBlogConfig } from './fs.js';
-export { createBlogFromCollection } from './collection.js';
-export type { CollectionBlogConfig } from './collection.js';

package/modules/blog/src/index.js

@@ -1,3 +1,8 @@
+// fs (gray-matter) blog loader — safe to import from anywhere (including
+// astro.config.mjs and non-Astro projects).
+//
+// For the Astro Content Collections variant, import from
+// `@ibalzam/codejitsu-core/blog/collection` (separate subpath because it
+// statically imports `astro:content`, which is only available inside Astro).
 export * from './types.js';
 export { createBlog } from './fs.js';
-export { createBlogFromCollection } from './collection.js';

package/modules/blog/src/index.ts

@@ -1,5 +1,10 @@
+// fs (gray-matter) blog loader — safe to import from anywhere (including
+// astro.config.mjs and non-Astro projects).
+//
+// For the Astro Content Collections variant, import from
+// `@ibalzam/codejitsu-core/blog/collection` (separate subpath because it
+// statically imports `astro:content`, which is only available inside Astro).
+
 export * from './types.js';
 export { createBlog } from './fs.js';
 export type { FsBlogConfig } from './fs.js';
-export { createBlogFromCollection } from './collection.js';
-export type { CollectionBlogConfig } from './collection.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibalzam/codejitsu-core",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "type": "module",
   "description": "Shared core for Codejitsu Astro sites — reusable code and Claude-facing instructions for blog, SEO, images, deploy, and llms.txt.",
   "keywords": [
@@ -43,6 +43,10 @@
       "types": "./modules/blog/src/index.d.ts",
       "default": "./modules/blog/src/index.js"
     },
+    "./blog/collection": {
+      "types": "./modules/blog/src/collection.d.ts",
+      "default": "./modules/blog/src/collection.js"
+    },
     "./seo": {
       "types": "./modules/seo/src/index.d.ts",
       "default": "./modules/seo/src/index.js"