Add tests, more fields

.gitignore

@@ -1 +1,2 @@
-node_modules/
+/node_modules/
+/coverage/

README.md

@@ -44,9 +44,13 @@ module.exports = function (eleventyConfig) {
 };
 ```
 
-Copy the templates as well:
+To ensure your site stays up to date with future plugin versions, add the following to your `_cloudcannon-prebuild.sh`:
 
 ```
+nvm use 14
+npm update eleventy-plugin-cloudcannon
+npm install
+rm -rf cloudcannon
 cp -R node_modules/eleventy-plugin-cloudcannon/cloudcannon .
 ```
 

cloudcannon/info.11tydata.js

@@ -41,16 +41,16 @@ module.exports = {
 	processItem: function (item, tag) {
 		return {
 			...item.template.frontMatter.data,
-			path: item.inputPath?.replace('./', '') ?? '',
-			url: item.url ?? '',
+			path: item.inputPath.replace('./', ''),
+			url: item.url || '',
 			collection: tag,
 			layout: item.template._layoutKey,
-			_unlisted: isUnlisted(item) ?? undefined,
+			_unlisted: isUnlisted(item),
 			output: item.url !== false
 		};
 	},
 
-	getCollectionsConfig: function (collections, cloudcannon) {
+	getCollectionsConfig: function (collections, cloudcannon, dataPath) {
 		if (cloudcannon?.collections) {
 			return cloudcannon.collections; // User-defined collections
 		}
@@ -77,8 +77,8 @@ module.exports = {
 			// Finds the top-most common basePaths to prevent sub-folders becoming separate entries
 			const topBasePaths = Array.from(collectionsMeta[key].basePaths).filter(isTopPath);
 
-			// Consider a collection output if more items are output than not
-			const isOutput = collectionsMeta[key].outputOffset > 0;
+			// Consider a collection output unless more items are not output
+			const isOutput = collectionsMeta[key].outputOffset >= 0;
 
 			topBasePaths.forEach((basePath) => {
 				// Multiple collections can share this basePath, but this should cover common use-cases
@@ -89,6 +89,6 @@ module.exports = {
 			});
 
 			return memo;
-		}, {});
+		}, dataPath ? { data: { path: dataPath, output: false } } : {});
 	}
 };

cloudcannon/info.njk

@@ -2,6 +2,7 @@
 eleventyExcludeFromCollections: true
 permalink: /_cloudcannon/info.json
 ---
+{% set dataPath %}{% ccConfigPath 'data' %}{% endset %}
 {
 	"time": "{{ build.date.toISOString() }}",
 	"cloudcannon": {
@@ -22,7 +23,7 @@ permalink: /_cloudcannon/info.json
 		"timezone": "{{ cloudcannon.timezone }}",
 	{% endif %}
 	"base-url": "{% ccPathPrefix %}",
-	"collections-config": {{ getCollectionsConfig(collections, cloudcannon) | ccJsonify | safe }},
+	"collections-config": {{ getCollectionsConfig(collections, cloudcannon, dataPath) | ccJsonify | safe }},
 	"collections": {
 		{%- for tag, items in getCollections(collections) %}
 			"{{ tag }}": [
@@ -70,7 +71,7 @@ permalink: /_cloudcannon/info.json
 		{% if cloudcannon.uploads_dir %}
 			"uploads": "{{ cloudcannon.uploads_dir }}",
 		{% endif %}
-		"data": "{% ccConfigPath 'data' %}",
+		"data": {{ dataPath | ccJsonify | safe }},
 		"collections": "",
 		"includes": "{% ccConfigPath 'includes' %}",
 		"layouts": "{% ccConfigPath 'layouts' %}"

jest.config.js

@@ -0,0 +1,194 @@
+/*
+ * For a detailed explanation regarding each configuration property, visit:
+ * https://jestjs.io/docs/configuration
+ */
+
+module.exports = {
+  // All imported modules in your tests should be mocked automatically
+  // automock: false,
+
+  // Stop running tests after `n` failures
+  // bail: 0,
+
+  // The directory where Jest should store its cached dependency information
+  // cacheDirectory: "/private/var/folders/1f/8j__ns6s2pgd2p1w8_4v39yc0000gn/T/jest_dx",
+
+  // Automatically clear mock calls and instances between every test
+  // clearMocks: false,
+
+  // Indicates whether the coverage information should be collected while executing the test
+  collectCoverage: true,
+
+  // An array of glob patterns indicating a set of files for which coverage information should be collected
+  // collectCoverageFrom: undefined,
+
+  // The directory where Jest should output its coverage files
+  coverageDirectory: "coverage",
+
+  // An array of regexp pattern strings used to skip coverage collection
+  // coveragePathIgnorePatterns: [
+  //   "/node_modules/"
+  // ],
+
+  // Indicates which provider should be used to instrument code for coverage
+  coverageProvider: "v8",
+
+  // A list of reporter names that Jest uses when writing coverage reports
+  // coverageReporters: [
+  //   "json",
+  //   "text",
+  //   "lcov",
+  //   "clover"
+  // ],
+
+  // An object that configures minimum threshold enforcement for coverage results
+  // coverageThreshold: undefined,
+
+  // A path to a custom dependency extractor
+  // dependencyExtractor: undefined,
+
+  // Make calling deprecated APIs throw helpful error messages
+  // errorOnDeprecated: false,
+
+  // Force coverage collection from ignored files using an array of glob patterns
+  // forceCoverageMatch: [],
+
+  // A path to a module which exports an async function that is triggered once before all test suites
+  // globalSetup: undefined,
+
+  // A path to a module which exports an async function that is triggered once after all test suites
+  // globalTeardown: undefined,
+
+  // A set of global variables that need to be available in all test environments
+  // globals: {},
+
+  // The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
+  // maxWorkers: "50%",
+
+  // An array of directory names to be searched recursively up from the requiring module's location
+  // moduleDirectories: [
+  //   "node_modules"
+  // ],
+
+  // An array of file extensions your modules use
+  // moduleFileExtensions: [
+  //   "js",
+  //   "jsx",
+  //   "ts",
+  //   "tsx",
+  //   "json",
+  //   "node"
+  // ],
+
+  // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
+  // moduleNameMapper: {},
+
+  // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
+  // modulePathIgnorePatterns: [],
+
+  // Activates notifications for test results
+  // notify: false,
+
+  // An enum that specifies notification mode. Requires { notify: true }
+  // notifyMode: "failure-change",
+
+  // A preset that is used as a base for Jest's configuration
+  // preset: undefined,
+
+  // Run tests from one or more projects
+  // projects: undefined,
+
+  // Use this configuration option to add custom reporters to Jest
+  // reporters: undefined,
+
+  // Automatically reset mock state between every test
+  // resetMocks: false,
+
+  // Reset the module registry before running each individual test
+  // resetModules: false,
+
+  // A path to a custom resolver
+  // resolver: undefined,
+
+  // Automatically restore mock state between every test
+  // restoreMocks: false,
+
+  // The root directory that Jest should scan for tests and modules within
+  // rootDir: undefined,
+
+  // A list of paths to directories that Jest should use to search for files in
+  // roots: [
+  //   "<rootDir>"
+  // ],
+
+  // Allows you to use a custom runner instead of Jest's default test runner
+  // runner: "jest-runner",
+
+  // The paths to modules that run some code to configure or set up the testing environment before each test
+  // setupFiles: [],
+
+  // A list of paths to modules that run some code to configure or set up the testing framework before each test
+  // setupFilesAfterEnv: [],
+
+  // The number of seconds after which a test is considered as slow and reported as such in the results.
+  // slowTestThreshold: 5,
+
+  // A list of paths to snapshot serializer modules Jest should use for snapshot testing
+  // snapshotSerializers: [],
+
+  // The test environment that will be used for testing
+  // testEnvironment: "jest-environment-node",
+
+  // Options that will be passed to the testEnvironment
+  // testEnvironmentOptions: {},
+
+  // Adds a location field to test results
+  // testLocationInResults: false,
+
+  // The glob patterns Jest uses to detect test files
+  // testMatch: [
+  //   "**/__tests__/**/*.[jt]s?(x)",
+  //   "**/?(*.)+(spec|test).[tj]s?(x)"
+  // ],
+
+  // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
+  // testPathIgnorePatterns: [
+  //   "/node_modules/"
+  // ],
+
+  // The regexp pattern or array of patterns that Jest uses to detect test files
+  // testRegex: [],
+
+  // This option allows the use of a custom results processor
+  // testResultsProcessor: undefined,
+
+  // This option allows use of a custom test runner
+  // testRunner: "jest-circus/runner",
+
+  // This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
+  // testURL: "http://localhost",
+
+  // Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout"
+  // timers: "real",
+
+  // A map from regular expressions to paths to transformers
+  // transform: undefined,
+
+  // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
+  // transformIgnorePatterns: [
+  //   "/node_modules/",
+  //   "\\.pnp\\.[^\\/]+$"
+  // ],
+
+  // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
+  // unmockedModulePathPatterns: undefined,
+
+  // Indicates whether each individual test should be reported during the run
+  // verbose: undefined,
+
+  // An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
+  // watchPathIgnorePatterns: [],
+
+  // Whether to use watchman for file crawling
+  // watchman: true,
+};