coralite-scripts 0.39.0 → 0.40.0

package/bin/index.js

@@ -7,6 +7,7 @@ import pkg from '../package.json' with { type: 'json' }
 import { join } from 'node:path'
 import { mkdir } from 'node:fs/promises'
 import { buildCommand } from '../libs/commands/build.js'
+import { parseAssetMapping, mergeAssets } from '../libs/assets.js'
 
 // remove all Node warnings before doing anything else
 process.removeAllListeners('warning')
@@ -20,6 +21,7 @@ program
   .addArgument(new Argument('<mode>', 'Run mode: dev (development server) or build (production compilation)').choices(['dev', 'build']).default('dev'))
   .option('-v, --verbose', 'Enable verbose logging output')
   .option('-c, --clean', 'Clear the output directory before building')
+  .option('-a, --assets <mapping...>', 'Static assets to copy during build. Format: pkg:path:dest or src:dest')
 
 program.parse(process.argv)
 program.on('error', (err) => {
@@ -34,6 +36,16 @@ if (!config) {
   process.exit(1)
 }
 
+if (options.assets) {
+  try {
+    const cliAssets = options.assets.map(parseAssetMapping)
+    config.assets = mergeAssets(config.assets, cliAssets)
+  } catch (err) {
+    console.error(`\n  Error: ${err.message}\n`)
+    process.exit(1)
+  }
+}
+
 if (mode === 'dev') {
   config.output = join(process.cwd(), '.coralite')
   await mkdir(config.output, { recursive: true })

package/dist/libs/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../libs/config.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,sCAzBW,oBAAoB,GAClB,oBAAoB,CAoJhC;0CA9JsC,mBAAmB"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../libs/config.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,sCAzBW,oBAAoB,GAClB,oBAAoB,CA2KhC;0CArLsC,mBAAmB"}

package/libs/assets.js

@@ -0,0 +1,55 @@
+/**
+ * @import { CoraliteStaticAsset } from 'coralite'
+ */
+
+/**
+ * Parses an asset mapping string into an asset object.
+ *
+ * @param {string} mapping - The mapping string (pkg:path:dest or src:dest).
+ * @returns {CoraliteStaticAsset} The parsed asset object.
+ * @throws {Error} If the mapping format is invalid.
+ */
+export function parseAssetMapping (mapping) {
+  const parts = mapping.split(':')
+
+  if (parts.length === 3) {
+    // pkg:path:dest
+    return {
+      pkg: parts[0],
+      path: parts[1],
+      dest: parts[2]
+    }
+  } else if (parts.length === 2) {
+    // src:dest
+    const src = parts[0]
+    if (!src.startsWith('.') && !src.startsWith('/') && !src.startsWith('..')) {
+      throw new Error(`Invalid asset mapping "${mapping}". Local paths must start with ".", "..", or "/". NPM package mappings require 3 parts (pkg:path:dest).`)
+    }
+    return {
+      src,
+      dest: parts[1]
+    }
+  } else {
+    throw new Error(`Invalid asset mapping "${mapping}". Expected format: pkg:path:dest or src:dest`)
+  }
+}
+
+/**
+ * Merges a list of CLI assets into an existing assets array, with CLI assets taking precedence on destination collisions.
+ *
+ * @param {CoraliteStaticAsset[]} baseAssets - The existing assets array.
+ * @param {CoraliteStaticAsset[]} cliAssets - The new assets to merge.
+ * @returns {CoraliteStaticAsset[]} The merged assets array.
+ */
+export function mergeAssets (baseAssets = [], cliAssets = []) {
+  const merged = [...baseAssets]
+  for (const cliAsset of cliAssets) {
+    const index = merged.findIndex(a => a.dest === cliAsset.dest)
+    if (index !== -1) {
+      merged[index] = cliAsset
+    } else {
+      merged.push(cliAsset)
+    }
+  }
+  return merged
+}

package/libs/commands/build.js

@@ -148,6 +148,32 @@ export async function buildCommand (config, options, logger = null) {
       await Promise.all(assetWrites)
     }
 
+    // Track assets from config to prevent them from being deleted as stale files
+    if (config.assets) {
+      for (const asset of config.assets) {
+        const fullDestPath = join(config.output, asset.dest)
+        if (existsSync(fullDestPath)) {
+          const stat = statSync(fullDestPath)
+          if (stat.isDirectory()) {
+            const trackFiles = (dir) => {
+              const files = readdirSync(dir)
+              for (const file of files) {
+                const fullPath = join(dir, file)
+                if (statSync(fullPath).isDirectory()) {
+                  trackFiles(fullPath)
+                } else {
+                  validFiles.add(fullPath)
+                }
+              }
+            }
+            trackFiles(fullDestPath)
+          } else {
+            validFiles.add(fullDestPath)
+          }
+        }
+      }
+    }
+
     if (!options.verbose) {
       if (skippedCount > 0) {
         spinner.succeed(`Pages built (${pageCount} completed, ${skippedCount} skipped)`)

package/libs/config.js

@@ -154,6 +154,29 @@ export function defineConfig (options) {
     if (!Array.isArray(options.assets)) {
       throw new Error('Configuration "assets" must be an array')
     }
+
+    for (const asset of options.assets) {
+      if (typeof asset !== 'object' || asset === null) {
+        throw new Error('Configuration "assets" items must be objects')
+      }
+
+      if (!asset.dest || typeof asset.dest !== 'string') {
+        throw new Error('Configuration "assets" items must have a string "dest" property')
+      }
+
+      if (asset.src) {
+        if (typeof asset.src !== 'string') {
+          throw new Error('Configuration "assets" items "src" property must be a string')
+        }
+      } else {
+        if (!asset.pkg || typeof asset.pkg !== 'string') {
+          throw new Error('Configuration "assets" items must have a string "pkg" property when "src" is not provided')
+        }
+        if (!asset.path || typeof asset.path !== 'string') {
+          throw new Error('Configuration "assets" items must have a string "path" property when "src" is not provided')
+        }
+      }
+    }
   }
 
   return options

package/libs/load-config.js

@@ -43,15 +43,10 @@ async function loadConfig (cwd = process.cwd()) {
       return null
     }
 
-    try {
-      return defineConfig(config.default)
-    } catch (err) {
-      displayError('Invalid configuration', err.message)
-      return null
-    }
+    return defineConfig(config.default)
   } catch (error) {
-    displayError('Failed to load configuration file', error)
-    return null
+    displayError('Failed to load configuration file', error.message || error)
+    throw error
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coralite-scripts",
-  "version": "0.39.0",
+  "version": "0.40.0",
   "description": "Configuration and scripts for Create Coralite.",
   "type": "module",
   "bin": {
@@ -61,11 +61,11 @@
     "portfinder": "^1.0.38",
     "postcss": "^8.5.15",
     "sass": "^1.101.0",
-    "coralite": "0.39.0"
+    "coralite": "0.40.0"
   },
   "scripts": {
-    "build": "premove dist && pnpm build-types",
-    "build-types": "tsc",
-    "test-unit": "node --test tests/**/*.spec.js"
+    "build": "premove dist && pnpm build:types",
+    "build:types": "tsc",
+    "test:unit": "node --test tests/**/*.spec.js"
   }
 }