Adds within CLI option (and argument to getEntries)

Author: zachleat

README.md

@@ -41,6 +41,10 @@ npx @11ty/import [type] [target] --overwrite
 # Change local fetch cache duration (default: 24h)
 npx @11ty/import [type] [target] --cacheduration=20m
 
+# Only import entries created (or updated) within a duration (default: *)
+# Same syntax as --cacheduration
+npx @11ty/import [type] [target] --within=7d
+
 # Change output format (default: markdown)
 npx @11ty/import [type] [target] --format=html
 
@@ -138,6 +142,7 @@ importer.addSource("bluesky", "@11ty.dev");
 
 let entries = await importer.getEntries({
 	contentType: "markdown", // --format
+	within: "*", // date or last updated date must be within this recent duration (e.g. 24h, 7d, 1y)
 });
 
 await importer.toFiles(entries);

cli.js

@@ -6,6 +6,8 @@ import { Importer } from "./src/Importer.js";
 import { Logger } from "./src/Logger.js";
 import { createRequire } from "node:module";
 
+// "string" or "boolean" types are supported by parseArgs
+// https://nodejs.org/docs/latest/api/util.html#utilparseargsconfig
 let { positionals, values } = parseArgs({
 	allowPositionals: true,
 	strict: true,
@@ -57,11 +59,15 @@ let { positionals, values } = parseArgs({
 			type: "string",
 			default: "relative",
 		},
+		within: {
+			type: "string",
+			default: "",
+		},
 	},
 });
 
 let [ type, target ] = positionals;
-let { quiet, dryrun, output, help, version, overwrite, cacheduration, format, persist, assetrefs } = values;
+let { quiet, dryrun, output, help, version, overwrite, cacheduration, format, persist, assetrefs, within } = values;
 
 if(version) {
 	const require = createRequire(import.meta.url);
@@ -137,6 +143,7 @@ if(persist) {
 
 let entries = await importer.getEntries({
 	contentType: format,
+	within,
 });
 
 await importer.toFiles(entries);

package-lock.json

@@ -35,6 +35,7 @@
 	"license": "MIT",
 	"dependencies": {
 		"@11ty/eleventy-fetch": "^5.0.1",
+		"@11ty/eleventy-utils": "^2.0.1",
 		"@11ty/posthtml-urls": "^1.0.0",
 		"@prettier/sync": "^0.5.2",
 		"@sindresorhus/slugify": "^2.2.1",

package.json

@@ -1,10 +1,10 @@
 import path from "node:path";
-import { createRequire } from "node:module";
 import fs from "graceful-fs";
 import yaml from "js-yaml";
 import kleur from "kleur";
 import slugify from '@sindresorhus/slugify';
 import * as entities from "entities";
+import { DateCompare } from "@11ty/eleventy-utils";
 
 import { Logger } from "./Logger.js";
 import { Fetcher } from "./Fetcher.js";
@@ -22,8 +22,7 @@ import { WordPressApi } from "./DataSource/WordPressApi.js";
 import { BlueskyUser } from "./DataSource/BlueskyUser.js";
 import { FediverseUser } from "./DataSource/FediverseUser.js";
 
-const require = createRequire(import.meta.url);
-const pkg = require("../package.json");
+import pkg from "../package.json" with { type: "json" };
 
 // For testing
 const MAX_IMPORT_SIZE = 0;
@@ -305,6 +304,26 @@ class Importer {
 			}
 		}
 
+		// If dateUpdated or date within the options.within option time frame, keeps it
+		// Otherwise, filtered out
+		if(options.within) {
+			entries = entries.filter(entry => {
+				if(entry.dateUpdated) {
+					if(DateCompare.isTimestampWithinDuration(entry.dateUpdated.getTime(), options.within)) {
+						return true;
+					}
+				}
+
+				if(entry.date) {
+					if(DateCompare.isTimestampWithinDuration(entry.dateUpdated.getTime(), options.within)) {
+						return true;
+					}
+				}
+				return false;
+			})
+		}
+
+		// purely for internals testing
 		if(MAX_IMPORT_SIZE) {
 			entries = entries.slice(0, MAX_IMPORT_SIZE);
 		}