nextjs-cms 0.5.55 → 0.5.58

package/dist/core/config/loader-with-jiti.d.ts

@@ -0,0 +1,13 @@
+export declare const getConfigImportVersion: () => number;
+/**
+ * Turbopack-safe loader:
+ * - In Next 16 Turbopack SSR, dynamic require(found) fails ("expression is too dynamic")
+ * - Native ESM importing `.ts` triggers MODULE_TYPELESS_PACKAGE_JSON warning
+ *
+ * SOLUTION:
+ * - Use `jiti` for TypeScript configs (no Node ESM, no warnings)
+ * - Use `require()` for CJS / JSON
+ * - Use native `import()` only for `.mjs`
+ */
+export declare const loadConfigModule: () => Promise<unknown>;
+//# sourceMappingURL=loader-with-jiti.d.ts.map

package/dist/core/config/loader-with-jiti.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"loader-with-jiti.d.ts","sourceRoot":"","sources":["../../../src/core/config/loader-with-jiti.ts"],"names":[],"mappings":"AAyCA,eAAO,MAAM,sBAAsB,cAAmC,CAAA;AA6GtE;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,QAAa,OAAO,CAAC,OAAO,CA4BxD,CAAA"}

package/dist/core/config/loader-with-jiti.js

@@ -0,0 +1,162 @@
+// loader.ts (or config-loader.ts)
+// Turbopack-safe config loader for Next.js 16+
+//
+// - Avoids dynamic require(found) which Turbopack rejects ("expression is too dynamic")
+// - Avoids native ESM importing `.ts` config (prevents MODULE_TYPELESS_PACKAGE_JSON warning)
+// - Uses jiti for TypeScript configs (sync, no Node ESM guessing)
+// - Still supports JS / CJS / MJS / JSON configs
+// - Keeps your Node CJS resolve patch for tests (js specifier -> ts fallback)
+import { existsSync } from 'fs';
+import { resolve, join } from 'path';
+import chokidar from 'chokidar';
+import chalk from 'chalk';
+import fs from 'fs';
+let jitiInstance = null;
+const hotMarkerFile = resolve(process.cwd(), 'components/form/helpers/_section-hot-reload.js');
+const configWatcherState = (() => {
+    const key = Symbol.for('nextjs-cms.configWatcher');
+    const globalAny = globalThis;
+    if (!globalAny[key]) {
+        globalAny[key] = {
+            watcher: null,
+            version: 0,
+            lastEventAt: new Map(),
+        };
+    }
+    return globalAny[key];
+})();
+export const getConfigImportVersion = () => configWatcherState.version;
+const clearJitiCache = (absPath) => {
+    if (!jitiInstance)
+        return;
+    try {
+        let resolvedPath;
+        try {
+            resolvedPath = jitiInstance.resolve(absPath);
+        }
+        catch {
+            resolvedPath = absPath;
+        }
+        if (resolvedPath && jitiInstance.cache?.[resolvedPath]) {
+            delete jitiInstance.cache[resolvedPath];
+        }
+        const tsPath = absPath.endsWith('.ts') ? absPath : `${absPath}.ts`;
+        if (tsPath !== resolvedPath && jitiInstance.cache?.[tsPath]) {
+            delete jitiInstance.cache[tsPath];
+        }
+    }
+    catch {
+        const absPathNormalized = absPath.replace(/\\/g, '/');
+        for (const key in jitiInstance.cache) {
+            if (key.replace(/\\/g, '/').includes(absPathNormalized)) {
+                delete jitiInstance.cache[key];
+            }
+        }
+    }
+};
+const bumpHotMarker = async () => {
+    if (process.env.NODE_ENV === 'production')
+        return;
+    const content = `/**\n` +
+        ` * AUTO-GENERATED. DO NOT EDIT.\n` +
+        ` * This file is used to track the last time the sections/config schema was updated.\n` +
+        ` * It is used to trigger a hot reload of the section/config in development mode.\n` +
+        ` */\n` +
+        `\n` +
+        `export const revalidate = 0\n` +
+        `\n` +
+        `// @refresh reset\n` +
+        `\n` +
+        `export const configLastUpdated = ${Date.now()}\n`;
+    try {
+        fs.writeFileSync(hotMarkerFile, content, 'utf8');
+    }
+    catch (err) {
+        console.error('Failed to bump _section-hot-reload.js:', err);
+    }
+};
+const startConfigWatcher = () => {
+    if (process.env.NODE_ENV === 'production' || configWatcherState.watcher)
+        return;
+    const cwd = process.cwd();
+    const invalidateForRelPath = async (relPath) => {
+        const normalized = relPath.replace(/\\/g, '/');
+        const now = Date.now();
+        const last = configWatcherState.lastEventAt.get(normalized);
+        if (last && now - last < 150)
+            return;
+        configWatcherState.lastEventAt.set(normalized, now);
+        console.log(chalk.green('Detected config file change, reloading config...'));
+        const absPath = resolve(cwd, relPath);
+        clearJitiCache(absPath);
+        configWatcherState.version++;
+        await bumpHotMarker();
+    };
+    configWatcherState.watcher = chokidar
+        .watch('cms.config.*', {
+        cwd,
+        ignoreInitial: true,
+        atomic: true,
+        awaitWriteFinish: {
+            stabilityThreshold: 100,
+            pollInterval: 20,
+        },
+    })
+        .setMaxListeners(3)
+        .on('add', async (path) => await invalidateForRelPath(path))
+        .on('change', async (path) => await invalidateForRelPath(path))
+        .on('unlink', async (path) => await invalidateForRelPath(path));
+};
+const findConfigFile = () => {
+    const cwd = process.cwd();
+    const candidates = [
+        'cms.config.js',
+        'cms.config.cjs',
+        'cms.config.mjs',
+        'cms.config.json',
+        'cms.config.ts',
+        'cms.config.cts',
+        'cms.config.mts',
+    ].map((f) => resolve(join(cwd, f)));
+    const found = candidates.find((p) => existsSync(p));
+    if (!found) {
+        throw new Error(`Config file not found. Searched: ${candidates.join(', ')}`);
+    }
+    const ext = found.slice(found.lastIndexOf('.')).toLowerCase();
+    return { found, ext };
+};
+/**
+ * Turbopack-safe loader:
+ * - In Next 16 Turbopack SSR, dynamic require(found) fails ("expression is too dynamic")
+ * - Native ESM importing `.ts` triggers MODULE_TYPELESS_PACKAGE_JSON warning
+ *
+ * SOLUTION:
+ * - Use `jiti` for TypeScript configs (no Node ESM, no warnings)
+ * - Use `require()` for CJS / JSON
+ * - Use native `import()` only for `.mjs`
+ */
+export const loadConfigModule = async () => {
+    startConfigWatcher();
+    const { found, ext } = findConfigFile();
+    if (!jitiInstance) {
+        const { createJiti } = await import('jiti');
+        jitiInstance = createJiti(import.meta.url, {
+            // Keep your previous behavior:
+            // - return default export compatibly
+            interopDefault: true,
+            // Caching (new API uses fsCache/moduleCache)
+            // Keep them enabled for better performance.
+            fsCache: true,
+            moduleCache: true,
+            rebuildFsCache: true,
+            // Optional: nicer debugging in stack traces (off by default in jiti)
+            // sourceMaps: true,
+        });
+    }
+    /**
+     * We're using the deprecated synchronous API because
+     * it works with Turbopack, the new jiti.import() does not.
+     */
+    const mod = jitiInstance(found);
+    return mod?.default ?? mod;
+};

package/dist/core/config/loader.d.ts

@@ -1,2 +1,2 @@
-export declare const loadConfigModule: () => unknown;
+export * from './loader-with-jiti.js';
 //# sourceMappingURL=loader.d.ts.map

package/dist/core/config/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/core/config/loader.ts"],"names":[],"mappings":"AAoCA,eAAO,MAAM,gBAAgB,QAAO,OA6CnC,CAAA"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/core/config/loader.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA"}

package/dist/core/config/loader.js

@@ -1,75 +1 @@
-import { existsSync } from 'fs';
-import { resolve, join } from 'path';
-import { createRequire } from 'module';
-// Create a require function that works in ES modules
-const safeRequire = createRequire(import.meta.url);
-/**
- * See SectionFactory.ts: during dev/tests we may runtime-load TS that contains NodeNext-style `./x.js` specifiers
- * pointing at `./x.ts` in the source tree. Patch CJS resolution to fall back to `.ts` for relative imports.
- */
-const withPatchedCjsResolveJsToTs = (fn) => {
-    const NodeModule = safeRequire('module');
-    const originalResolve = NodeModule._resolveFilename;
-    NodeModule._resolveFilename = function (request, parent, isMain, options) {
-        try {
-            return originalResolve.call(this, request, parent, isMain, options);
-        }
-        catch (err) {
-            if (typeof request === 'string' && /^(\.{1,2}\/.*)\.js$/.test(request)) {
-                const tsRequest = request.replace(/\.js$/, '.ts');
-                try {
-                    return originalResolve.call(this, tsRequest, parent, isMain, options);
-                }
-                catch {
-                    // fall through to rethrow original error
-                }
-            }
-            throw err;
-        }
-    };
-    try {
-        return fn();
-    }
-    finally {
-        NodeModule._resolveFilename = originalResolve;
-    }
-};
-export const loadConfigModule = () => {
-    const cwd = process.cwd();
-    const candidates = [
-        'cms.config.js',
-        'cms.config.cjs',
-        'cms.config.mjs',
-        'cms.config.json',
-        'cms.config.ts',
-        'cms.config.cts',
-        'cms.config.mts',
-    ].map((f) => resolve(join(cwd, f)));
-    const found = candidates.find((p) => existsSync(p));
-    if (!found) {
-        throw new Error(`Config file not found. Searched: ${candidates.join(', ')}`);
-    }
-    const isTs = found.endsWith('.ts') || found.endsWith('.cts') || found.endsWith('.mts');
-    let unregister;
-    try {
-        if (isTs) {
-            try {
-                const { register } = safeRequire('esbuild-register/dist/node');
-                unregister = register({ format: 'cjs', loader: 'ts' }).unregister;
-            }
-            catch {
-                throw new Error(`Unable to load TypeScript config '${found}'. Install 'esbuild-register', or provide cms.config.js/json.`);
-            }
-        }
-        const mod = process.env.NODE_ENV === 'test'
-            ? isTs
-                ? withPatchedCjsResolveJsToTs(() => safeRequire(found))
-                : safeRequire(found)
-            : safeRequire(found);
-        unregister?.();
-        return mod.default ?? mod;
-    }
-    finally {
-        unregister?.();
-    }
-};
+export * from './loader-with-jiti.js';

package/dist/core/factories/SectionFactory.d.ts

@@ -1,110 +1,2 @@
-import { HasItemsSection, SimpleSection, CategorySection } from '../sections/index.js';
-import type { CategorySectionConfig, HasItemsSectionConfig, SimpleSectionConfig } from '../sections/index.js';
-import type { SectionTypes } from '../types/index.js';
-type AnySectionConfig = HasItemsSectionConfig | SimpleSectionConfig | CategorySectionConfig;
-export declare class SectionFactory {
-    /**
-     * These are the fixed sections that can not be present in the sections folder.
-     */
-    static readonly fixedSections: string[];
-    private static readonly isDev;
-    private static readonly isProd;
-    private static sectionProcessingErrors;
-    private static sectionFetchingErrors;
-    private static errorCount;
-    /**
-     * Global in-process cache for all section configs.
-     * Populated once per Node process via loadAllSections(),
-     * reused by all get*() calls until the process is restarted,
-     * so all subsequent calls reuse this array.
-     */
-    private static allSectionsPromise;
-    private static allSectionsLoaded;
-    private static watcherStarted;
-    static bumpHotMarker(): void;
-    /**
-     * Get all sections
-     * @param type - The type of sections to get
-     * @returns The sections
-     */
-    static getSections(type?: SectionTypes | SectionTypes[]): Promise<AnySectionConfig[]>;
-    /**
-     * Get all accessible sections for an admin
-     * @param type - The type of section to get
-     * @param admin - The admin to get the sections for
-     * @returns The sections for the admin
-     */
-    static getSectionsForAdmin({ type, admin, }: {
-        type?: SectionTypes | SectionTypes[];
-        admin: {
-            id: string;
-            requiredRole?: 'C' | 'U' | 'D';
-        };
-    }): Promise<{
-        simple: SimpleSectionConfig[];
-        has_items: HasItemsSectionConfig[];
-        category: CategorySectionConfig[];
-        fixed: string[];
-    }>;
-    /**
-     * Get a section
-     * @param name - The name of the section to get
-     * @param type - The type of section to get
-     * @returns The section
-     */
-    static getSection({ name, type, }: {
-        name: string;
-        type?: SectionTypes | SectionTypes[];
-    }): Promise<AnySectionConfig | null>;
-    /**
-     * Get an accessible section for an admin
-     * @param name - The name of the section to get
-     * @param type - The type of section to get
-     * @param admin - The admin to get the section for
-     * @returns The section for the admin
-     */
-    static getSectionForAdmin({ name, type, admin, }: {
-        name: string;
-        type?: SectionTypes | SectionTypes[];
-        admin: {
-            id: string;
-            requiredRole?: 'C' | 'U' | 'D';
-        };
-    }): Promise<AnySectionConfig | null>;
-    /**
-     * Create a Section instance from a section config
-     * The config must have a build() method (created via helper functions like simpleSection(), hasItemsSection(), etc.)
-     *
-     * Note: This factory only accepts configs. If you already have a Section instance,
-     * use it directly - don't pass it to this factory.
-     *
-     * @param config - A section config object with a build() method
-     * @returns A Section instance
-     * @throws Error if config doesn't have a build() method
-     */
-    static create(config: {
-        build: () => HasItemsSection | SimpleSection | CategorySection;
-        [key: string]: any;
-    }): HasItemsSection | SimpleSection | CategorySection;
-    /**
-     * Return a clone of the section(s) info to get a fresh copy of the section(s).
-     * Not cloning will cause the original section(s) (in *.section.ts file) to be modified!
-     * Each *.section.ts file must have exactly one default export (arrays are not allowed).
-
-     * @param name - The name of the section to get
-     * @param type - The type of section to get
-     * @param admin - The admin to get the section for
-     * @returns The section(s)
-     */
-    private static get;
-    /**
-     * Load all *.section.ts files once, require their default exports,
-     * and cache the resulting configs for the lifetime of the process
-     * (until invalidated in dev by file changes).
-     */
-    private static loadAllSections;
-    private static startWatcher;
-    private static init;
-}
-export {};
+export * from './section-factory-with-jiti.js';
 //# sourceMappingURL=SectionFactory.d.ts.map

package/dist/core/factories/SectionFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SectionFactory.d.ts","sourceRoot":"","sources":["../../../src/core/factories/SectionFactory.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtF,OAAO,KAAK,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC7G,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAoFrD,KAAK,gBAAgB,GAAG,qBAAqB,GAAG,mBAAmB,GAAG,qBAAqB,CAAA;AAY3F,qBAAa,cAAc;IACvB;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,aAAa,WAAiD;IAE9E,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAwC;IACrE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAc;IAE5C,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAA+B;IACrE,OAAO,CAAC,MAAM,CAAC,qBAAqB,CAA+B;IACnE,OAAO,CAAC,MAAM,CAAC,UAAU,CAAI;IAE7B;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAA2C;IAC5E,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAQ;IACxC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAQ;IAErC,MAAM,CAAC,aAAa,IAAI,IAAI;IAwB5B;;;;OAIG;WACU,WAAW,CAAC,IAAI,CAAC,EAAE,YAAY,GAAG,YAAY,EAAE,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAI3F;;;;;OAKG;WACU,mBAAmB,CAAC,EAC7B,IAAI,EACJ,KAAK,GACR,EAAE;QACC,IAAI,CAAC,EAAE,YAAY,GAAG,YAAY,EAAE,CAAA;QACpC,KAAK,EAAE;YACH,EAAE,EAAE,MAAM,CAAA;YACV,YAAY,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAA;SACjC,CAAA;KACJ,GAAG,OAAO,CAAC;QACR,MAAM,EAAE,mBAAmB,EAAE,CAAA;QAC7B,SAAS,EAAE,qBAAqB,EAAE,CAAA;QAClC,QAAQ,EAAE,qBAAqB,EAAE,CAAA;QACjC,KAAK,EAAE,MAAM,EAAE,CAAA;KAClB,CAAC;IA+BF;;;;;OAKG;WACU,UAAU,CAAC,EACpB,IAAI,EACJ,IAAI,GACP,EAAE;QACC,IAAI,EAAE,MAAM,CAAA;QACZ,IAAI,CAAC,EAAE,YAAY,GAAG,YAAY,EAAE,CAAA;KACvC,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAKpC;;;;;;OAMG;WACU,kBAAkB,CAAC,EAC5B,IAAI,EACJ,IAAI,EACJ,KAAK,GACR,EAAE;QACC,IAAI,EAAE,MAAM,CAAA;QACZ,IAAI,CAAC,EAAE,YAAY,GAAG,YAAY,EAAE,CAAA;QACpC,KAAK,EAAE;YACH,EAAE,EAAE,MAAM,CAAA;YACV,YAAY,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAA;SACjC,CAAA;KACJ,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAKpC;;;;;;;;;;OAUG;IACH,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE;QAClB,KAAK,EAAE,MAAM,eAAe,GAAG,aAAa,GAAG,eAAe,CAAA;QAC9D,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KACrB,GAAG,eAAe,GAAG,aAAa,GAAG,eAAe;IAYrD;;;;;;;;;OASG;mBACkB,GAAG;IA6FxB;;;;OAIG;mBACkB,eAAe;IAuHpC,OAAO,CAAC,MAAM,CAAC,YAAY;IA+D3B,OAAO,CAAC,MAAM,CAAC,IAAI;CAatB"}
+{"version":3,"file":"SectionFactory.d.ts","sourceRoot":"","sources":["../../../src/core/factories/SectionFactory.ts"],"names":[],"mappings":"AAAA,cAAc,gCAAgC,CAAA"}