@jungvonmatt/contentful-typings 5.0.0 → 6.0.0

package/dist/cli.js

@@ -28,14 +28,12 @@ program
     .option('-l, --localized', 'Add localized types')
     .option('-d, --jsdoc', 'Add JSDoc comments')
     .option('-g, --typeguard', 'Add type guards')
-    .option('-l, --legacy', 'Use legacy types (before contentful@10)')
     .action(actionRunner(async (cmd) => {
     const output = cmd?.output ?? '';
     const typings = await generateTypings({
         typeguard: cmd.typeguard,
         jsdoc: cmd.jsdoc,
         localized: cmd.localized,
-        legacy: cmd.legacy,
         cwd: cmd?.cwd || process.cwd(),
         configFile: cmd?.config || undefined,
     });

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,IAAI,MAAM,YAAY,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAe7C,MAAM,YAAY,GAAG,CAAC,KAAmB,EAAE,OAAgB,EAAE,EAAE;IAC7D,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;QACzB,QAAQ,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC/B,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,YAAY,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,YAAY,GAChB,CAAC,EAAE,EAAE,GAAG,GAAG,IAAI,EAAE,EAAE,CACnB,CAAC,GAAG,IAAI,EAAE,EAAE,CAEV,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAmB,EAAE,EAAE;IACxC,YAAY,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC;AAC5B,CAAC,CAAC,CAAC;AAEP,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,OAAO;KACJ,OAAO,CAAC,UAAU,CAAC;KACnB,WAAW,CAAC,+DAA+D,CAAC;KAC5E,MAAM,CACL,uBAAuB,EACvB,oEAAoE,CACrE;KACA,MAAM,CAAC,mBAAmB,EAAE,8CAA8C,CAAC;KAC3E,MAAM,CAAC,yBAAyB,EAAE,qBAAqB,EAAE,sBAAsB,CAAC;KAChF,MAAM,CAAC,iBAAiB,EAAE,qBAAqB,CAAC;KAChD,MAAM,CAAC,aAAa,EAAE,oBAAoB,CAAC;KAC3C,MAAM,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;KAC5C,MAAM,CAAC,cAAc,EAAE,yCAAyC,CAAC;KACjE,MAAM,CACL,YAAY,CAAC,KAAK,EAAE,GAAgB,EAAE,EAAE;IACtC,MAAM,MAAM,GAAW,GAAG,EAAE,MAAM,IAAI,EAAE,CAAC;IACzC,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC;QACpC,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE;QAC9B,UAAU,EAAE,GAAG,EAAE,MAAM,IAAI,SAAS;KACrC,CAAC,CAAC;IAEH,MAAM,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,MAAM,EAAE,CAAC,CAAC,CAAC;AAChD,CAAC,CAAC,CACH,CAAC;AAEJ,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,IAAI,MAAM,YAAY,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAc7C,MAAM,YAAY,GAAG,CAAC,KAAmB,EAAE,OAAgB,EAAE,EAAE;IAC7D,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;QACzB,QAAQ,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC/B,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,YAAY,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,YAAY,GAChB,CAAC,EAAE,EAAE,GAAG,GAAG,IAAI,EAAE,EAAE,CACnB,CAAC,GAAG,IAAI,EAAE,EAAE,CAEV,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAmB,EAAE,EAAE;IACxC,YAAY,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC;AAC5B,CAAC,CAAC,CAAC;AAEP,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,OAAO;KACJ,OAAO,CAAC,UAAU,CAAC;KACnB,WAAW,CAAC,+DAA+D,CAAC;KAC5E,MAAM,CACL,uBAAuB,EACvB,oEAAoE,CACrE;KACA,MAAM,CAAC,mBAAmB,EAAE,8CAA8C,CAAC;KAC3E,MAAM,CAAC,yBAAyB,EAAE,qBAAqB,EAAE,sBAAsB,CAAC;KAChF,MAAM,CAAC,iBAAiB,EAAE,qBAAqB,CAAC;KAChD,MAAM,CAAC,aAAa,EAAE,oBAAoB,CAAC;KAC3C,MAAM,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;KAC5C,MAAM,CACL,YAAY,CAAC,KAAK,EAAE,GAAgB,EAAE,EAAE;IACtC,MAAM,MAAM,GAAW,GAAG,EAAE,MAAM,IAAI,EAAE,CAAC;IACzC,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC;QACpC,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE;QAC9B,UAAU,EAAE,GAAG,EAAE,MAAM,IAAI,SAAS;KACrC,CAAC,CAAC;IAEH,MAAM,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,MAAM,EAAE,CAAC,CAAC,CAAC;AAChD,CAAC,CAAC,CACH,CAAC;AAEJ,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}

package/dist/index.js

@@ -1,15 +1,17 @@
 import path from 'node:path';
 import pico from 'picocolors';
 import { loadContentfulConfig } from '@jungvonmatt/contentful-config';
-import { getEnvironment, pagedGet } from '@jungvonmatt/contentful-ssg/lib/contentful';
-import { CFDefinitionsBuilder } from 'cf-content-types-generator';
-import { readPackageUp } from 'read-pkg-up';
+import { getEnvironment } from '@jungvonmatt/contentful-ssg/lib/contentful';
+import { getManagementClient } from '@jungvonmatt/contentful-client';
+import { fetchAll } from 'contentful-management';
+import { CFDefinitionsBuilder, } from 'cf-content-types-generator';
+import { readFile } from 'node:fs/promises';
 import semiver from 'semiver';
-import { DefaultContentTypeRenderer, V10ContentTypeRenderer, V10TypeGuardRenderer, JsDocRenderer, LocalizedContentTypeRenderer, TypeGuardRenderer, } from './renderer/index.js';
+import { DefaultContentTypeRenderer, V10TypeGuardRenderer, JsDocRenderer, LocalizedContentTypeRenderer, TypeGuardRenderer, } from './renderer/index.js';
 const isLegacyVersion = async (dir) => {
     try {
-        const cwd = path.join(dir || process.cwd(), 'node_modules', 'contentful');
-        const { packageJson } = await readPackageUp({ cwd });
+        const pkgPath = path.join(dir || process.cwd(), 'node_modules', 'contentful', 'package.json');
+        const packageJson = JSON.parse(await readFile(pkgPath, 'utf-8'));
         if (packageJson.name === 'contentful' &&
             semiver(packageJson.version, '10.0.0-beta-v10.33') < 0) {
             return true;
@@ -24,15 +26,17 @@ export const generateTypings = async (options = {}) => {
         cwd: options?.cwd,
         required: ['managementToken', 'environmentId', 'spaceId'],
     });
-    const client = await getEnvironment(loaderResult.config);
-    console.log(`Generating typescript definitions for: ${pico.gray('spaces/')}${pico.green(loaderResult.config.spaceId)}${pico.gray('/environments/')}${pico.green(loaderResult.config.environmentId)}`);
-    const { items: contentTypes } = await pagedGet(client, {
-        method: 'getContentTypes',
-    });
+    const config = loaderResult.config;
+    const environment = await getEnvironment(config);
+    const client = getManagementClient(config);
+    console.log(`Generating typescript definitions for: ${pico.gray('spaces/')}${pico.green(config.spaceId)}${pico.gray('/environments/')}${pico.green(config.environmentId)}`);
+    const contentTypes = await fetchAll((params) => client.contentType.getMany({
+        spaceId: config.spaceId,
+        environmentId: config.environmentId ?? environment.sys.id,
+        ...params,
+    }), {});
     const legacyVersion = typeof options.legacy === 'undefined' ? await isLegacyVersion() : options.legacy;
-    const renderers = [
-        legacyVersion ? new DefaultContentTypeRenderer() : new V10ContentTypeRenderer(),
-    ];
+    const renderers = [new DefaultContentTypeRenderer()];
     if (options.localized) {
         renderers.push(new LocalizedContentTypeRenderer());
     }

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/renderer/contentTypeRenderer.d.ts

@@ -1,7 +1,4 @@
-import { DefaultContentTypeRenderer as DefaultContentTypeRendererOriginal, V10ContentTypeRenderer as V10ContentTypeRendererOriginal, type RenderContext } from 'cf-content-types-generator';
-export declare class DefaultContentTypeRenderer extends DefaultContentTypeRendererOriginal {
-    createContext(): RenderContext;
-}
-export declare class V10ContentTypeRenderer extends V10ContentTypeRendererOriginal {
+import { ContentTypeRenderer as ContentTypeRendererOriginal, type RenderContext } from 'cf-content-types-generator';
+export declare class DefaultContentTypeRenderer extends ContentTypeRendererOriginal {
     createContext(): RenderContext;
 }

package/dist/renderer/contentTypeRenderer.js

@@ -1,13 +1,8 @@
-import { DefaultContentTypeRenderer as DefaultContentTypeRendererOriginal, V10ContentTypeRenderer as V10ContentTypeRendererOriginal, } from 'cf-content-types-generator';
-import { context, v10context } from './context.js';
-export class DefaultContentTypeRenderer extends DefaultContentTypeRendererOriginal {
+import { ContentTypeRenderer as ContentTypeRendererOriginal, } from 'cf-content-types-generator';
+import { context } from './context.js';
+export class DefaultContentTypeRenderer extends ContentTypeRendererOriginal {
     createContext() {
         return context;
     }
 }
-export class V10ContentTypeRenderer extends V10ContentTypeRendererOriginal {
-    createContext() {
-        return v10context;
-    }
-}
 //# sourceMappingURL=contentTypeRenderer.js.map

package/dist/renderer/contentTypeRenderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"contentTypeRenderer.js","sourceRoot":"","sources":["../../src/renderer/contentTypeRenderer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,IAAI,kCAAkC,EAChE,sBAAsB,IAAI,8BAA8B,GAEzD,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAEnD,MAAM,OAAO,0BAA2B,SAAQ,kCAAkC;IACzE,aAAa;QAClB,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AAED,MAAM,OAAO,sBAAuB,SAAQ,8BAA8B;IACjE,aAAa;QAClB,OAAO,UAAU,CAAC;IACpB,CAAC;CACF"}
+{"version":3,"file":"contentTypeRenderer.js","sourceRoot":"","sources":["../../src/renderer/contentTypeRenderer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,IAAI,2BAA2B,GAEnD,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,MAAM,OAAO,0BAA2B,SAAQ,2BAA2B;IAClE,aAAa;QAClB,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}

package/dist/renderer/context.d.ts

@@ -3,4 +3,3 @@ export declare const moduleName: (name: string) => string;
 export declare const moduleFieldsName: (name: string) => string;
 export declare const moduleSkeletonName: (name: string) => string;
 export declare const context: RenderContext;
-export declare const v10context: RenderContext;

package/dist/renderer/context.js

@@ -1,16 +1,10 @@
 import { pascalCase } from 'change-case';
-import { createDefaultContext, createV10Context, } from 'cf-content-types-generator';
+import { createContext } from 'cf-content-types-generator';
 export const moduleName = (name) => pascalCase(name);
 export const moduleFieldsName = (name) => `${moduleName(name)}Fields`;
 export const moduleSkeletonName = (name) => `${moduleName(name)}Skeleton`;
 export const context = {
-    ...createDefaultContext(),
-    moduleName,
-    moduleFieldsName,
-    moduleSkeletonName,
-};
-export const v10context = {
-    ...createV10Context(),
+    ...createContext(),
     moduleName,
     moduleFieldsName,
     moduleSkeletonName,

package/dist/renderer/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/renderer/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EACL,oBAAoB,EACpB,gBAAgB,GAEjB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;AAC7D,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC;AAC9E,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC;AAC1F,MAAM,CAAC,MAAM,OAAO,GAAkB;IACpC,GAAG,oBAAoB,EAAE;IACzB,UAAU;IACV,gBAAgB;IAChB,kBAAkB;CACnB,CAAC;AACF,MAAM,CAAC,MAAM,UAAU,GAAkB;IACvC,GAAG,gBAAgB,EAAE;IACrB,UAAU;IACV,gBAAgB;IAChB,kBAAkB;CACnB,CAAC"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/renderer/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAsB,MAAM,4BAA4B,CAAC;AAE/E,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;AAC7D,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC;AAC9E,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC;AAC1F,MAAM,CAAC,MAAM,OAAO,GAAkB;IACpC,GAAG,aAAa,EAAE;IAClB,UAAU;IACV,gBAAgB;IAChB,kBAAkB;CACnB,CAAC"}

package/dist/renderer/index.d.ts

@@ -1,4 +1,4 @@
-export { DefaultContentTypeRenderer, V10ContentTypeRenderer } from './contentTypeRenderer.js';
+export { DefaultContentTypeRenderer } from './contentTypeRenderer.js';
 export { JsDocRenderer } from './jsDocRenderer.js';
 export { TypeGuardRenderer, V10TypeGuardRenderer } from './typeGuardRenderer.js';
 export { LocalizedContentTypeRenderer } from './localizedContentRenderer.js';

package/dist/renderer/index.js

@@ -1,4 +1,4 @@
-export { DefaultContentTypeRenderer, V10ContentTypeRenderer } from './contentTypeRenderer.js';
+export { DefaultContentTypeRenderer } from './contentTypeRenderer.js';
 export { JsDocRenderer } from './jsDocRenderer.js';
 export { TypeGuardRenderer, V10TypeGuardRenderer } from './typeGuardRenderer.js';
 export { LocalizedContentTypeRenderer } from './localizedContentRenderer.js';

package/dist/renderer/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/renderer/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAC9F,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AACjF,OAAO,EAAE,4BAA4B,EAAE,MAAM,+BAA+B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/renderer/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AACjF,OAAO,EAAE,4BAA4B,EAAE,MAAM,+BAA+B,CAAC"}

package/dist/renderer/localizedContentRenderer.d.ts

@@ -1,4 +1,4 @@
-import { LocalizedContentTypeRenderer as LocalizedContentTypeRendererOriginal, type RenderContext } from 'cf-content-types-generator';
-export declare class LocalizedContentTypeRenderer extends LocalizedContentTypeRendererOriginal {
+import { ContentTypeRenderer as ContentTypeRendererBase, type RenderContext } from 'cf-content-types-generator';
+export declare class LocalizedContentTypeRenderer extends ContentTypeRendererBase {
     createContext(): RenderContext;
 }

package/dist/renderer/localizedContentRenderer.js

@@ -1,6 +1,6 @@
-import { LocalizedContentTypeRenderer as LocalizedContentTypeRendererOriginal, } from 'cf-content-types-generator';
+import { ContentTypeRenderer as ContentTypeRendererBase, } from 'cf-content-types-generator';
 import { context } from './context.js';
-export class LocalizedContentTypeRenderer extends LocalizedContentTypeRendererOriginal {
+export class LocalizedContentTypeRenderer extends ContentTypeRendererBase {
     createContext() {
         return context;
     }

package/dist/renderer/localizedContentRenderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"localizedContentRenderer.js","sourceRoot":"","sources":["../../src/renderer/localizedContentRenderer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,IAAI,oCAAoC,GAErE,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,MAAM,OAAO,4BAA6B,SAAQ,oCAAoC;IAC7E,aAAa;QAClB,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}
+{"version":3,"file":"localizedContentRenderer.js","sourceRoot":"","sources":["../../src/renderer/localizedContentRenderer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,IAAI,uBAAuB,GAE/C,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,MAAM,OAAO,4BAA6B,SAAQ,uBAAuB;IAChE,aAAa;QAClB,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}

package/dist/renderer/typeGuardRenderer.d.ts

@@ -1,10 +1,10 @@
-import { TypeGuardRenderer as TypeGuardRendererOriginal, V10TypeGuardRenderer as V10TypeGuardRendererOriginal, type RenderContext, type CFContentType } from 'cf-content-types-generator';
+import { TypeGuardRenderer as TypeGuardRendererOriginal, type RenderContext, type CFContentType } from 'cf-content-types-generator';
 import { type SourceFile } from 'ts-morph';
 export declare class TypeGuardRenderer extends TypeGuardRendererOriginal {
     createContext(): RenderContext;
     render: (contentType: CFContentType, file: SourceFile) => void;
 }
-export declare class V10TypeGuardRenderer extends V10TypeGuardRendererOriginal {
+export declare class V10TypeGuardRenderer extends TypeGuardRendererOriginal {
     createContext(): RenderContext;
     render: (contentType: CFContentType, file: SourceFile) => void;
 }

package/dist/renderer/typeGuardRenderer.js

@@ -1,5 +1,5 @@
-import { TypeGuardRenderer as TypeGuardRendererOriginal, V10TypeGuardRenderer as V10TypeGuardRendererOriginal, renderTypeGeneric, } from 'cf-content-types-generator';
-import { context, v10context, moduleName } from './context.js';
+import { TypeGuardRenderer as TypeGuardRendererOriginal, renderTypeGeneric, } from 'cf-content-types-generator';
+import { context, moduleName } from './context.js';
 export class TypeGuardRenderer extends TypeGuardRendererOriginal {
     createContext() {
         return context;
@@ -29,15 +29,15 @@ export class TypeGuardRenderer extends TypeGuardRendererOriginal {
         file.formatText();
     };
 }
-export class V10TypeGuardRenderer extends V10TypeGuardRendererOriginal {
+export class V10TypeGuardRenderer extends TypeGuardRendererOriginal {
     createContext() {
-        return v10context;
+        return context;
     }
     render = (contentType, file) => {
         const entryInterfaceName = moduleName(contentType.sys.id);
         file.addImportDeclaration({
             moduleSpecifier: `contentful`,
-            namedImports: ['ChainModifiers', 'Entry', 'LocaleCode'],
+            namedImports: ['ChainModifiers', 'Entry', 'EntrySkeletonType', 'LocaleCode'],
             isTypeOnly: true,
         });
         file.addFunction({

package/dist/renderer/typeGuardRenderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"typeGuardRenderer.js","sourceRoot":"","sources":["../../src/renderer/typeGuardRenderer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,IAAI,yBAAyB,EAC9C,oBAAoB,IAAI,4BAA4B,EAGpD,iBAAiB,GAClB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/D,MAAM,OAAO,iBAAkB,SAAQ,yBAAyB;IACvD,aAAa;QAClB,OAAO,OAAO,CAAC;IACjB,CAAC;IAEM,MAAM,GAAG,CAAC,WAA0B,EAAE,IAAgB,EAAQ,EAAE;QACrE,MAAM,kBAAkB,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAE1D,IAAI,CAAC,oBAAoB,CAAC;YACxB,eAAe,EAAE,uBAAuB;YACxC,YAAY,EAAE,CAAC,qBAAqB,CAAC;YACrC,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,CAAC;YACf,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE,KAAK,kBAAkB,EAAE;YAC/B,UAAU,EAAE,YAAY,kBAAkB,EAAE;YAC5C,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,qBAAqB;iBAC5B;aACF;YACD,UAAU,EAAE,4CAA4C,WAAW,CAAC,GAAG,CAAC,EAAE,GAAG;SAC9E,CAAC,CAAC;QAEH,IAAI,CAAC,eAAe,CAAC;YACnB,wBAAwB,EAAE,IAAI;SAC/B,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC,CAAC;CACH;AAED,MAAM,OAAO,oBAAqB,SAAQ,4BAA4B;IAC7D,aAAa;QAClB,OAAO,UAAU,CAAC;IACpB,CAAC;IAEM,MAAM,GAAG,CAAC,WAA0B,EAAE,IAAgB,EAAQ,EAAE;QACrE,MAAM,kBAAkB,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAE1D,IAAI,CAAC,oBAAoB,CAAC;YACxB,eAAe,EAAE,YAAY;YAC7B,YAAY,EAAE,CAAC,gBAAgB,EAAE,OAAO,EAAE,YAAY,CAAC;YACvD,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,CAAC;YACf,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE,iBAAiB,CACrB,KAAK,kBAAkB,EAAE,EACzB,kCAAkC,EAClC,4BAA4B,CAC7B;YACD,UAAU,EAAE,YAAY,iBAAiB,CAAC,kBAAkB,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE;YACvF,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,iBAAiB,CAAC,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,SAAS,CAAC;iBAC9E;aACF;YACD,UAAU,EAAE,4CAA4C,WAAW,CAAC,GAAG,CAAC,EAAE,GAAG;SAC9E,CAAC,CAAC;QAEH,IAAI,CAAC,eAAe,CAAC;YACnB,wBAAwB,EAAE,IAAI;SAC/B,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC,CAAC;CACH"}
+{"version":3,"file":"typeGuardRenderer.js","sourceRoot":"","sources":["../../src/renderer/typeGuardRenderer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,IAAI,yBAAyB,EAG9C,iBAAiB,GAClB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAEnD,MAAM,OAAO,iBAAkB,SAAQ,yBAAyB;IACvD,aAAa;QAClB,OAAO,OAAO,CAAC;IACjB,CAAC;IAEM,MAAM,GAAG,CAAC,WAA0B,EAAE,IAAgB,EAAQ,EAAE;QACrE,MAAM,kBAAkB,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAE1D,IAAI,CAAC,oBAAoB,CAAC;YACxB,eAAe,EAAE,uBAAuB;YACxC,YAAY,EAAE,CAAC,qBAAqB,CAAC;YACrC,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,CAAC;YACf,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE,KAAK,kBAAkB,EAAE;YAC/B,UAAU,EAAE,YAAY,kBAAkB,EAAE;YAC5C,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,qBAAqB;iBAC5B;aACF;YACD,UAAU,EAAE,4CAA4C,WAAW,CAAC,GAAG,CAAC,EAAE,GAAG;SAC9E,CAAC,CAAC;QAEH,IAAI,CAAC,eAAe,CAAC;YACnB,wBAAwB,EAAE,IAAI;SAC/B,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC,CAAC;CACH;AAED,MAAM,OAAO,oBAAqB,SAAQ,yBAAyB;IAC1D,aAAa;QAClB,OAAO,OAAO,CAAC;IACjB,CAAC;IAEM,MAAM,GAAG,CAAC,WAA0B,EAAE,IAAgB,EAAQ,EAAE;QACrE,MAAM,kBAAkB,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAE1D,IAAI,CAAC,oBAAoB,CAAC;YACxB,eAAe,EAAE,YAAY;YAC7B,YAAY,EAAE,CAAC,gBAAgB,EAAE,OAAO,EAAE,mBAAmB,EAAE,YAAY,CAAC;YAC5E,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,CAAC;YACf,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE,iBAAiB,CACrB,KAAK,kBAAkB,EAAE,EACzB,kCAAkC,EAClC,4BAA4B,CAC7B;YACD,UAAU,EAAE,YAAY,iBAAiB,CAAC,kBAAkB,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE;YACvF,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,iBAAiB,CAAC,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,SAAS,CAAC;iBAC9E;aACF;YACD,UAAU,EAAE,4CAA4C,WAAW,CAAC,GAAG,CAAC,EAAE,GAAG;SAC9E,CAAC,CAAC;QAEH,IAAI,CAAC,eAAe,CAAC;YACnB,wBAAwB,EAAE,IAAI;SAC/B,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC,CAAC;CACH"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jungvonmatt/contentful-typings",
-  "version": "5.0.0",
+  "version": "6.0.0",
   "homepage": "https://github.com/jungvonmatt/contentful-ssg#readme",
   "bugs": {
     "url": "https://github.com/jungvonmatt/contentful-ssg/issues"
@@ -27,7 +27,7 @@
   },
   "scripts": {
     "clean": "rimraf ./dist",
-    "test": "vitest run",
+    "test": "vitest run --root ../.. packages/contentful-typings/src",
     "lint": "oxlint --type-aware --fix src",
     "precompile": "pnpm run clean",
     "compile": "tsc --build",
@@ -36,27 +36,27 @@
   },
   "dependencies": {
     "@faker-js/faker": "^8.3.1",
-    "@jungvonmatt/contentful-config": "5.0.0",
-    "@jungvonmatt/contentful-ssg": "5.0.0",
-    "cf-content-types-generator": "^2.16.0",
+    "@jungvonmatt/contentful-client": "6.0.0",
+    "@jungvonmatt/contentful-config": "6.0.0",
+    "@jungvonmatt/contentful-ssg": "6.0.0",
+    "cf-content-types-generator": "^3.0.1",
     "change-case": "^5.4.2",
-    "commander": "^11.1.0",
-    "contentful": "^11.7.15",
-    "contentful-management": "^11.54.4",
-    "exit-hook": "^4.0.0",
+    "commander": "^14.0.3",
+    "contentful": "^11.12.2",
+    "contentful-management": "^12.5.0",
+    "exit-hook": "^5.1.0",
     "fs-extra": "^11.1.0",
     "picocolors": "^1.0.0",
-    "read-pkg-up": "^11.0.0",
     "semiver": "^1.1.0"
   },
   "devDependencies": {
     "@types/chance": "^1.1.6",
     "@types/fs-extra": "^11.0.4",
-    "rimraf": "^5.0.5",
-    "ts-morph": "^23.0.0"
+    "rimraf": "^6.0.1",
+    "ts-morph": "^27.0.0"
   },
   "engines": {
     "node": ">=22"
   },
-  "gitHead": "dfbefe2c66877ed9411bdb242327e6915f58cf3e"
+  "gitHead": "72a840af083dd2739517cd30c4a7b8277c462d81"
 }

package/src/cli.test.ts

@@ -0,0 +1,141 @@
+import { vi, describe, test, expect, beforeEach, afterEach } from 'vitest';
+
+const generateTypings = vi.fn();
+const outputFile = vi.fn();
+
+vi.mock('./index.js', () => ({
+  generateTypings: (...args: unknown[]) => generateTypings(...args),
+}));
+
+vi.mock('fs-extra', () => ({
+  outputFile: (...args: unknown[]) => outputFile(...args),
+}));
+
+vi.mock('@jungvonmatt/contentful-ssg/lib/ui', () => ({
+  logError: vi.fn(),
+}));
+
+vi.mock('exit-hook', () => ({
+  gracefulExit: vi.fn(),
+}));
+
+describe('contentful-typings CLI', () => {
+  let originalArgv: string[];
+  let consoleLog: ReturnType<typeof vi.fn>;
+
+  beforeEach(() => {
+    originalArgv = process.argv;
+    consoleLog = vi.fn();
+    vi.spyOn(console, 'log').mockImplementation(consoleLog);
+    vi.resetModules();
+    generateTypings.mockReset();
+    outputFile.mockReset();
+  });
+
+  afterEach(() => {
+    process.argv = originalArgv;
+    vi.restoreAllMocks();
+  });
+
+  test('generate command calls generateTypings and writes output', async () => {
+    generateTypings.mockResolvedValue('// generated types\nexport type Page = {};');
+    outputFile.mockResolvedValue(undefined);
+
+    process.argv = ['node', 'cli', 'generate', '--output', 'types.ts'];
+
+    await import('./cli.js');
+    await new Promise((resolve) => setTimeout(resolve, 50));
+
+    expect(generateTypings).toHaveBeenCalledWith(
+      expect.objectContaining({
+        typeguard: undefined,
+        jsdoc: undefined,
+        localized: undefined,
+      }),
+    );
+    expect(outputFile).toHaveBeenCalledWith(
+      'types.ts',
+      '// generated types\nexport type Page = {};',
+    );
+    expect(consoleLog).toHaveBeenCalledWith(expect.stringContaining('types.ts'));
+  });
+
+  test('generate uses default output path', async () => {
+    generateTypings.mockResolvedValue('// types');
+    outputFile.mockResolvedValue(undefined);
+
+    process.argv = ['node', 'cli', 'generate'];
+    await import('./cli.js');
+    await new Promise((resolve) => setTimeout(resolve, 50));
+
+    expect(outputFile).toHaveBeenCalledWith('@types/contentful.ts', '// types');
+  });
+
+  test('generate passes --typeguard flag', async () => {
+    generateTypings.mockResolvedValue('// types');
+    outputFile.mockResolvedValue(undefined);
+
+    process.argv = ['node', 'cli', 'generate', '--typeguard'];
+    await import('./cli.js');
+    await new Promise((resolve) => setTimeout(resolve, 50));
+
+    expect(generateTypings).toHaveBeenCalledWith(expect.objectContaining({ typeguard: true }));
+  });
+
+  test('generate passes --jsdoc flag', async () => {
+    generateTypings.mockResolvedValue('// types');
+    outputFile.mockResolvedValue(undefined);
+
+    process.argv = ['node', 'cli', 'generate', '--jsdoc'];
+    await import('./cli.js');
+    await new Promise((resolve) => setTimeout(resolve, 50));
+
+    expect(generateTypings).toHaveBeenCalledWith(expect.objectContaining({ jsdoc: true }));
+  });
+
+  test('generate passes --localized flag', async () => {
+    generateTypings.mockResolvedValue('// types');
+    outputFile.mockResolvedValue(undefined);
+
+    process.argv = ['node', 'cli', 'generate', '--localized'];
+    await import('./cli.js');
+    await new Promise((resolve) => setTimeout(resolve, 50));
+
+    expect(generateTypings).toHaveBeenCalledWith(expect.objectContaining({ localized: true }));
+  });
+
+  test('generate passes --cwd option', async () => {
+    generateTypings.mockResolvedValue('// types');
+    outputFile.mockResolvedValue(undefined);
+
+    process.argv = ['node', 'cli', 'generate', '--cwd', '/custom/dir'];
+    await import('./cli.js');
+    await new Promise((resolve) => setTimeout(resolve, 50));
+
+    expect(generateTypings).toHaveBeenCalledWith(expect.objectContaining({ cwd: '/custom/dir' }));
+  });
+
+  test('generate passes --config option', async () => {
+    generateTypings.mockResolvedValue('// types');
+    outputFile.mockResolvedValue(undefined);
+
+    process.argv = ['node', 'cli', 'generate', '--config', 'my.config.js'];
+    await import('./cli.js');
+    await new Promise((resolve) => setTimeout(resolve, 50));
+
+    expect(generateTypings).toHaveBeenCalledWith(
+      expect.objectContaining({ configFile: 'my.config.js' }),
+    );
+  });
+
+  test('generate handles error from generateTypings', async () => {
+    const { gracefulExit } = await import('exit-hook');
+    generateTypings.mockRejectedValue(new Error('Generation failed'));
+
+    process.argv = ['node', 'cli', 'generate'];
+    await import('./cli.js');
+    await new Promise((resolve) => setTimeout(resolve, 50));
+
+    expect(gracefulExit).toHaveBeenCalledWith(1);
+  });
+});

package/src/cli.ts

@@ -13,7 +13,6 @@ type CommandArgs = {
   typeguard?: boolean;
   jsdoc?: boolean;
   localized?: boolean;
-  legacy?: boolean;
   cwd?: string;
   config?: string;
 };
@@ -55,7 +54,6 @@ program
   .option('-l, --localized', 'Add localized types')
   .option('-d, --jsdoc', 'Add JSDoc comments')
   .option('-g, --typeguard', 'Add type guards')
-  .option('-l, --legacy', 'Use legacy types (before contentful@10)')
   .action(
     actionRunner(async (cmd: CommandArgs) => {
       const output: string = cmd?.output ?? '';
@@ -63,7 +61,6 @@ program
         typeguard: cmd.typeguard,
         jsdoc: cmd.jsdoc,
         localized: cmd.localized,
-        legacy: cmd.legacy,
         cwd: cmd?.cwd || process.cwd(),
         configFile: cmd?.config || undefined,
       });

package/src/index.test.ts

@@ -15,38 +15,62 @@ vi.mock('@jungvonmatt/contentful-ssg/lib/contentful', async (importOriginal) =>
   const actual = (await importOriginal()) as Record<string, unknown>;
   return {
     ...actual,
-    getEnvironment: vi.fn().mockResolvedValue({}),
-    pagedGet: vi.fn().mockResolvedValue({
-      items: [
-        {
-          sys: { id: 'page', type: 'ContentType' },
-          name: 'Page',
-          displayField: 'title',
-          description: '',
-          fields: [
-            {
-              id: 'title',
-              name: 'Title',
-              type: 'Symbol',
-              required: true,
-              localized: false,
-              omitted: false,
-              disabled: false,
-              validations: [],
-            },
-          ],
-        },
-      ],
-    }),
+    getEnvironment: vi.fn().mockResolvedValue({ sys: { id: 'master' } }),
   };
 });
 
-vi.mock('read-pkg-up', () => ({
-  readPackageUp: vi.fn().mockResolvedValue({
-    packageJson: { name: 'contentful', version: '10.5.0' },
+vi.mock('contentful-management', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('contentful-management')>();
+  return {
+    ...actual,
+  };
+});
+
+vi.mock('@jungvonmatt/contentful-client', () => ({
+  getManagementClient: vi.fn().mockReturnValue({
+    contentType: {
+      getMany: vi.fn().mockResolvedValue({
+        items: [
+          {
+            sys: { id: 'page', type: 'ContentType' },
+            name: 'Page',
+            displayField: 'title',
+            description: '',
+            fields: [
+              {
+                id: 'title',
+                name: 'Title',
+                type: 'Symbol',
+                required: true,
+                localized: false,
+                omitted: false,
+                disabled: false,
+                validations: [],
+              },
+            ],
+          },
+        ],
+        total: 1,
+        skip: 0,
+        limit: 100,
+      }),
+    },
   }),
 }));
 
+vi.mock('node:fs/promises', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('node:fs/promises')>();
+  return {
+    ...actual,
+    readFile: vi.fn().mockImplementation((filePath: string) => {
+      if (typeof filePath === 'string' && filePath.includes('contentful/package.json')) {
+        return Promise.resolve(JSON.stringify({ name: 'contentful', version: '10.5.0' }));
+      }
+      return actual.readFile(filePath, 'utf-8');
+    }),
+  };
+});
+
 describe('generateTypings', () => {
   test('renders V10 skeleton types by default', async () => {
     console.log = vi.fn();

package/src/index.ts

@@ -1,16 +1,21 @@
 /* _eslint-disable @typescript-eslint/no-unsafe-call */
 import path from 'node:path';
 import pico from 'picocolors';
-import { type ContentfulConfig, type ContentType } from '@jungvonmatt/contentful-ssg';
+import { type ContentfulConfig } from '@jungvonmatt/contentful-ssg';
 import { loadContentfulConfig } from '@jungvonmatt/contentful-config';
-import { getEnvironment, pagedGet } from '@jungvonmatt/contentful-ssg/lib/contentful';
-import { CFDefinitionsBuilder, type ContentTypeRenderer } from 'cf-content-types-generator';
-import { readPackageUp } from 'read-pkg-up';
+import { getEnvironment } from '@jungvonmatt/contentful-ssg/lib/contentful';
+import { getManagementClient } from '@jungvonmatt/contentful-client';
+import { fetchAll } from 'contentful-management';
+import {
+  CFDefinitionsBuilder,
+  type CFContentType,
+  type Renderer,
+} from 'cf-content-types-generator';
+import { readFile } from 'node:fs/promises';
 import semiver from 'semiver';
 
 import {
   DefaultContentTypeRenderer,
-  V10ContentTypeRenderer,
   V10TypeGuardRenderer,
   JsDocRenderer,
   LocalizedContentTypeRenderer,
@@ -28,8 +33,11 @@ type Options = {
 
 const isLegacyVersion = async (dir?: string) => {
   try {
-    const cwd = path.join(dir || process.cwd(), 'node_modules', 'contentful');
-    const { packageJson } = await readPackageUp({ cwd });
+    const pkgPath = path.join(dir || process.cwd(), 'node_modules', 'contentful', 'package.json');
+    const packageJson = JSON.parse(await readFile(pkgPath, 'utf-8')) as {
+      name: string;
+      version: string;
+    };
     // New skeleton types were released in contentful v10.0.0-beta-v10.33
     if (
       packageJson.name === 'contentful' &&
@@ -50,22 +58,28 @@ export const generateTypings = async (options: Options = {}) => {
     required: ['managementToken', 'environmentId', 'spaceId'],
   });
 
-  const client = await getEnvironment(loaderResult.config);
+  const config = loaderResult.config;
+  const environment = await getEnvironment(config);
+  const client = getManagementClient(config);
 
   console.log(
-    `Generating typescript definitions for: ${pico.gray('spaces/')}${pico.green(loaderResult.config.spaceId)}${pico.gray('/environments/')}${pico.green(loaderResult.config.environmentId)}`,
+    `Generating typescript definitions for: ${pico.gray('spaces/')}${pico.green(config.spaceId)}${pico.gray('/environments/')}${pico.green(config.environmentId)}`,
   );
 
-  const { items: contentTypes } = await pagedGet<ContentType>(client, {
-    method: 'getContentTypes',
-  });
+  const contentTypes = await fetchAll(
+    (params) =>
+      client.contentType.getMany({
+        spaceId: config.spaceId,
+        environmentId: config.environmentId ?? environment.sys.id,
+        ...params,
+      }),
+    {},
+  );
 
   const legacyVersion =
     typeof options.legacy === 'undefined' ? await isLegacyVersion() : options.legacy;
 
-  const renderers: ContentTypeRenderer[] = [
-    legacyVersion ? new DefaultContentTypeRenderer() : new V10ContentTypeRenderer(),
-  ];
+  const renderers: Renderer[] = [new DefaultContentTypeRenderer()];
   if (options.localized) {
     renderers.push(new LocalizedContentTypeRenderer());
   }
@@ -81,7 +95,7 @@ export const generateTypings = async (options: Options = {}) => {
   const builder = new CFDefinitionsBuilder(renderers);
 
   for (const model of contentTypes) {
-    builder.appendType(model);
+    builder.appendType(model as CFContentType);
   }
 
   return builder.toString();

package/src/renderer/contentTypeRenderer.ts

@@ -1,18 +1,11 @@
 import {
-  DefaultContentTypeRenderer as DefaultContentTypeRendererOriginal,
-  V10ContentTypeRenderer as V10ContentTypeRendererOriginal,
+  ContentTypeRenderer as ContentTypeRendererOriginal,
   type RenderContext,
 } from 'cf-content-types-generator';
-import { context, v10context } from './context.js';
+import { context } from './context.js';
 
-export class DefaultContentTypeRenderer extends DefaultContentTypeRendererOriginal {
+export class DefaultContentTypeRenderer extends ContentTypeRendererOriginal {
   public createContext(): RenderContext {
     return context;
   }
 }
-
-export class V10ContentTypeRenderer extends V10ContentTypeRendererOriginal {
-  public createContext(): RenderContext {
-    return v10context;
-  }
-}

package/src/renderer/context.ts

@@ -1,21 +1,11 @@
 import { pascalCase } from 'change-case';
-import {
-  createDefaultContext,
-  createV10Context,
-  type RenderContext,
-} from 'cf-content-types-generator';
+import { createContext, type RenderContext } from 'cf-content-types-generator';
 
 export const moduleName = (name: string) => pascalCase(name);
 export const moduleFieldsName = (name: string) => `${moduleName(name)}Fields`;
 export const moduleSkeletonName = (name: string): string => `${moduleName(name)}Skeleton`;
 export const context: RenderContext = {
-  ...createDefaultContext(),
-  moduleName,
-  moduleFieldsName,
-  moduleSkeletonName,
-};
-export const v10context: RenderContext = {
-  ...createV10Context(),
+  ...createContext(),
   moduleName,
   moduleFieldsName,
   moduleSkeletonName,

package/src/renderer/index.ts

@@ -1,4 +1,4 @@
-export { DefaultContentTypeRenderer, V10ContentTypeRenderer } from './contentTypeRenderer.js';
+export { DefaultContentTypeRenderer } from './contentTypeRenderer.js';
 export { JsDocRenderer } from './jsDocRenderer.js';
 export { TypeGuardRenderer, V10TypeGuardRenderer } from './typeGuardRenderer.js';
 export { LocalizedContentTypeRenderer } from './localizedContentRenderer.js';

package/src/renderer/localizedContentRenderer.ts

@@ -1,10 +1,10 @@
 import {
-  LocalizedContentTypeRenderer as LocalizedContentTypeRendererOriginal,
+  ContentTypeRenderer as ContentTypeRendererBase,
   type RenderContext,
 } from 'cf-content-types-generator';
 import { context } from './context.js';
 
-export class LocalizedContentTypeRenderer extends LocalizedContentTypeRendererOriginal {
+export class LocalizedContentTypeRenderer extends ContentTypeRendererBase {
   public createContext(): RenderContext {
     return context;
   }

package/src/renderer/renderer.test.ts

@@ -1,6 +1,7 @@
+import { describe, test, expect } from 'vitest';
 import { CFDefinitionsBuilder, type CFContentType } from 'cf-content-types-generator';
 import { moduleName, moduleFieldsName, moduleSkeletonName } from './context.js';
-import { DefaultContentTypeRenderer, V10ContentTypeRenderer } from './contentTypeRenderer.js';
+import { DefaultContentTypeRenderer } from './contentTypeRenderer.js';
 import { JsDocRenderer } from './jsDocRenderer.js';
 import { LocalizedContentTypeRenderer } from './localizedContentRenderer.js';
 import { TypeGuardRenderer, V10TypeGuardRenderer } from './typeGuardRenderer.js';
@@ -8,8 +9,6 @@ import { TypeGuardRenderer, V10TypeGuardRenderer } from './typeGuardRenderer.js'
 const contentType: CFContentType = {
   sys: { id: 'page-block', type: 'ContentType' } as CFContentType['sys'],
   name: 'Page Block',
-  displayField: 'title',
-  description: '',
   fields: [
     {
       id: 'title',
@@ -47,8 +46,8 @@ describe('renderer/contentTypeRenderer', () => {
     expect(out).toContain('PageBlock');
   });
 
-  test('V10ContentTypeRenderer produces skeleton types', () => {
-    const builder = new CFDefinitionsBuilder([new V10ContentTypeRenderer()]);
+  test('DefaultContentTypeRenderer produces skeleton types', () => {
+    const builder = new CFDefinitionsBuilder([new DefaultContentTypeRenderer()]);
     builder.appendType(contentType);
     const out = builder.toString();
     expect(out).toContain('PageBlock');
@@ -58,7 +57,10 @@ describe('renderer/contentTypeRenderer', () => {
 
 describe('renderer/jsDocRenderer', () => {
   test('emits JSDoc comments referencing Pascal cased name', () => {
-    const builder = new CFDefinitionsBuilder([new V10ContentTypeRenderer(), new JsDocRenderer()]);
+    const builder = new CFDefinitionsBuilder([
+      new DefaultContentTypeRenderer(),
+      new JsDocRenderer(),
+    ]);
     builder.appendType(contentType);
     const out = builder.toString();
     expect(out).toMatch(/\/\*\*[\s\S]*PageBlock/);
@@ -68,12 +70,12 @@ describe('renderer/jsDocRenderer', () => {
 describe('renderer/localizedContentRenderer', () => {
   test('emits localized type when included', () => {
     const builder = new CFDefinitionsBuilder([
-      new V10ContentTypeRenderer(),
+      new DefaultContentTypeRenderer(),
       new LocalizedContentTypeRenderer(),
     ]);
     builder.appendType(contentType);
     const out = builder.toString();
-    expect(out).toContain('Localized');
+    expect(out).toContain('LocaleCode');
   });
 });
 
@@ -91,7 +93,7 @@ describe('renderer/typeGuardRenderer', () => {
 
   test('V10TypeGuardRenderer emits skeleton-aware guard', () => {
     const builder = new CFDefinitionsBuilder([
-      new V10ContentTypeRenderer(),
+      new DefaultContentTypeRenderer(),
       new V10TypeGuardRenderer(),
     ]);
     builder.appendType(contentType);

package/src/renderer/typeGuardRenderer.ts

@@ -1,12 +1,11 @@
 import {
   TypeGuardRenderer as TypeGuardRendererOriginal,
-  V10TypeGuardRenderer as V10TypeGuardRendererOriginal,
   type RenderContext,
   type CFContentType,
   renderTypeGeneric,
 } from 'cf-content-types-generator';
 import { type SourceFile } from 'ts-morph';
-import { context, v10context, moduleName } from './context.js';
+import { context, moduleName } from './context.js';
 
 export class TypeGuardRenderer extends TypeGuardRendererOriginal {
   public createContext(): RenderContext {
@@ -43,9 +42,9 @@ export class TypeGuardRenderer extends TypeGuardRendererOriginal {
   };
 }
 
-export class V10TypeGuardRenderer extends V10TypeGuardRendererOriginal {
+export class V10TypeGuardRenderer extends TypeGuardRendererOriginal {
   public createContext(): RenderContext {
-    return v10context;
+    return context;
   }
 
   public render = (contentType: CFContentType, file: SourceFile): void => {
@@ -53,7 +52,7 @@ export class V10TypeGuardRenderer extends V10TypeGuardRendererOriginal {
 
     file.addImportDeclaration({
       moduleSpecifier: `contentful`,
-      namedImports: ['ChainModifiers', 'Entry', 'LocaleCode'],
+      namedImports: ['ChainModifiers', 'Entry', 'EntrySkeletonType', 'LocaleCode'],
       isTypeOnly: true,
     });