@jungvonmatt/contentful-typings 1.12.6 → 1.14.0

package/dist/cli.js

@@ -26,16 +26,18 @@ const program = new Command();
 program
     .command('generate')
     .description('Generate typescript definitions for contentful content types.')
-    .option('-o, --output <filepath>', 'Specify output file', '@types/contentful.d.ts')
+    .option('-o, --output <filepath>', 'Specify output file', '@types/contentful.ts')
     .option('-l, --localized', 'Add localized types')
     .option('-d, --jsdoc', 'Add JSDoc comments')
-    .option('-g, --typeguard ', 'Add type guards')
+    .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,
     });
     await outputFile(output, typings);
     console.log(pico.green(`  added: ${output}`));

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,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;AAC5B,MAAM,CAAC,GAAG,CAAC,CAAC;AAYZ,MAAM,YAAY,GAAG,CAAC,KAAmB,EAAE,OAAgB,EAAE,EAAE;IAC7D,IAAI,CAAC,OAAO,EAAE;QACZ,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;KACJ;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,KAAK,EAAE,EAAE;IAC1B,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,CAAC,yBAAyB,EAAE,qBAAqB,EAAE,wBAAwB,CAAC;KAClF,MAAM,CAAC,iBAAiB,EAAE,qBAAqB,CAAC;KAChD,MAAM,CAAC,aAAa,EAAE,oBAAoB,CAAC;KAC3C,MAAM,CAAC,kBAAkB,EAAE,iBAAiB,CAAC;KAC7C,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;KACzB,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,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;AAC5B,MAAM,CAAC,GAAG,CAAC,CAAC;AAaZ,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,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;KACnB,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.d.ts

@@ -1,7 +1,8 @@
-declare type Options = {
+type Options = {
     localized?: boolean;
     jsdoc?: boolean;
     typeguard?: boolean;
+    legacy?: boolean;
 };
 export declare const generateTypings: (options?: Options) => Promise<string>;
 export {};

package/dist/index.js

@@ -1,18 +1,36 @@
+import path from 'node:path';
 import { getConfig } from '@jungvonmatt/contentful-ssg/lib/config';
 import { getEnvironment, pagedGet } from '@jungvonmatt/contentful-ssg/lib/contentful';
 import { askMissing } from '@jungvonmatt/contentful-ssg/lib/ui';
 import { CFDefinitionsBuilder } from 'cf-content-types-generator';
-import { DefaultContentTypeRenderer, JsDocRenderer, LocalizedContentTypeRenderer, TypeGuardRenderer, } from './renderer/index.js';
+import { readPackageUp } from 'read-pkg-up';
+import semiver from 'semiver';
+import { DefaultContentTypeRenderer, V10ContentTypeRenderer, 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 });
+        if (packageJson.name === 'contentful' &&
+            semiver(packageJson.version, '10.0.0-beta-v10.33') < 0) {
+            return true;
+        }
+    }
+    catch { }
+    return false;
+};
 export const generateTypings = async (options = {}) => {
-    const contentfulConfig = (await askMissing(await getConfig({
+    const contentfulConfig = await askMissing(await getConfig({
         previewAccessToken: '-',
         accessToken: '-',
-    })));
+    }));
     const client = await getEnvironment(contentfulConfig);
     const { items: contentTypes } = await pagedGet(client, {
         method: 'getContentTypes',
     });
-    const renderers = [new DefaultContentTypeRenderer()];
+    const legacyVersion = typeof options.legacy === 'undefined' ? await isLegacyVersion() : options.legacy;
+    const renderers = [
+        legacyVersion ? new DefaultContentTypeRenderer() : new V10ContentTypeRenderer(),
+    ];
     if (options.localized) {
         renderers.push(new LocalizedContentTypeRenderer());
     }
@@ -20,7 +38,7 @@ export const generateTypings = async (options = {}) => {
         renderers.push(new JsDocRenderer());
     }
     if (options.typeguard) {
-        renderers.push(new TypeGuardRenderer());
+        renderers.push(legacyVersion ? new TypeGuardRenderer() : new V10TypeGuardRenderer());
     }
     const builder = new CFDefinitionsBuilder(renderers);
     for (const model of contentTypes) {

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,4CAA4C,CAAC;AACtF,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAuB,MAAM,4BAA4B,CAAC;AAEvF,OAAO,EACL,0BAA0B,EAC1B,aAAa,EACb,4BAA4B,EAC5B,iBAAiB,GAClB,MAAM,qBAAqB,CAAC;AAQ7B,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,UAAmB,EAAE,EAAE,EAAE;IAC7D,MAAM,gBAAgB,GAAqB,CAAC,MAAM,UAAU,CAC1D,MAAM,SAAS,CAAC;QACd,kBAAkB,EAAE,GAAG;QACvB,WAAW,EAAE,GAAG;KACjB,CAAC,CACH,CAAqB,CAAC;IAEvB,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,gBAAgB,CAAC,CAAC;IAEtD,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,MAAM,QAAQ,CAAc,MAAM,EAAE;QAClE,MAAM,EAAE,iBAAiB;KAC1B,CAAC,CAAC;IAEH,MAAM,SAAS,GAA0B,CAAC,IAAI,0BAA0B,EAAE,CAAC,CAAC;IAC5E,IAAI,OAAO,CAAC,SAAS,EAAE;QACrB,SAAS,CAAC,IAAI,CAAC,IAAI,4BAA4B,EAAE,CAAC,CAAC;KACpD;IAED,IAAI,OAAO,CAAC,KAAK,EAAE;QACjB,SAAS,CAAC,IAAI,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC;KACrC;IAED,IAAI,OAAO,CAAC,SAAS,EAAE;QACrB,SAAS,CAAC,IAAI,CAAC,IAAI,iBAAiB,EAAE,CAAC,CAAC;KACzC;IAED,MAAM,OAAO,GAAG,IAAI,oBAAoB,CAAC,SAAS,CAAC,CAAC;IAEpD,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE;QAChC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;KAC3B;IAED,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;AAC5B,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,4CAA4C,CAAC;AACtF,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAA4B,MAAM,4BAA4B,CAAC;AAC5F,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EACL,0BAA0B,EAC1B,sBAAsB,EACtB,oBAAoB,EACpB,aAAa,EACb,4BAA4B,EAC5B,iBAAiB,GAClB,MAAM,qBAAqB,CAAC;AAS7B,MAAM,eAAe,GAAG,KAAK,EAAE,GAAY,EAAE,EAAE;IAC7C,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;QAC1E,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,aAAa,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;QAErD,IACE,WAAW,CAAC,IAAI,KAAK,YAAY;YAEjC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,oBAAoB,CAAC,GAAG,CAAC,EACtD,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IAEV,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,UAAmB,EAAE,EAAE,EAAE;IAC7D,MAAM,gBAAgB,GAAG,MAAM,UAAU,CACvC,MAAM,SAAS,CAAC;QACd,kBAAkB,EAAE,GAAG;QACvB,WAAW,EAAE,GAAG;KACjB,CAAC,CACH,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,gBAAoC,CAAC,CAAC;IAE1E,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,MAAM,QAAQ,CAAc,MAAM,EAAE;QAClE,MAAM,EAAE,iBAAiB;KAC1B,CAAC,CAAC;IAEH,MAAM,aAAa,GACjB,OAAO,OAAO,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,eAAe,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IAEnF,MAAM,SAAS,GAA0B;QACvC,aAAa,CAAC,CAAC,CAAC,IAAI,0BAA0B,EAAE,CAAC,CAAC,CAAC,IAAI,sBAAsB,EAAE;KAChF,CAAC;IACF,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACtB,SAAS,CAAC,IAAI,CAAC,IAAI,4BAA4B,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QAClB,SAAS,CAAC,IAAI,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC;IACtC,CAAC;IAED,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACtB,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,iBAAiB,EAAE,CAAC,CAAC,CAAC,IAAI,oBAAoB,EAAE,CAAC,CAAC;IACvF,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,oBAAoB,CAAC,SAAS,CAAC,CAAC;IAEpD,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;QACjC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;AAC5B,CAAC,CAAC"}

package/dist/renderer/contentTypeRenderer.d.ts

@@ -1,4 +1,7 @@
-import { DefaultContentTypeRenderer as DefaultContentTypeRendererOriginal, RenderContext } from 'cf-content-types-generator';
+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 {
+    createContext(): RenderContext;
+}

package/dist/renderer/contentTypeRenderer.js

@@ -1,8 +1,13 @@
-import { DefaultContentTypeRenderer as DefaultContentTypeRendererOriginal, } from 'cf-content-types-generator';
-import { context } from './context.js';
+import { DefaultContentTypeRenderer as DefaultContentTypeRendererOriginal, V10ContentTypeRenderer as V10ContentTypeRendererOriginal, } from 'cf-content-types-generator';
+import { context, v10context } from './context.js';
 export class DefaultContentTypeRenderer extends DefaultContentTypeRendererOriginal {
     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,GAEjE,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,MAAM,OAAO,0BAA2B,SAAQ,kCAAkC;IACzE,aAAa;QAClB,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}
+{"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"}

package/dist/renderer/context.d.ts

@@ -1,4 +1,6 @@
-import { RenderContext } from 'cf-content-types-generator';
+import { type RenderContext } from 'cf-content-types-generator';
 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,6 +1,18 @@
-import camelcase from 'camelcase';
-import { createDefaultContext } from 'cf-content-types-generator';
-export const moduleName = (name) => `${camelcase(name, { pascalCase: true })}`;
+import { pascalCase } from 'change-case';
+import { createDefaultContext, createV10Context, } from 'cf-content-types-generator';
+export const moduleName = (name) => `${pascalCase(name)}`;
 export const moduleFieldsName = (name) => `${moduleName(name)}Fields`;
-export const context = { ...createDefaultContext(), moduleName, moduleFieldsName };
+export const moduleSkeletonName = (name) => `${moduleName(name)}Skeleton`;
+export const context = {
+    ...createDefaultContext(),
+    moduleName,
+    moduleFieldsName,
+    moduleSkeletonName,
+};
+export const v10context = {
+    ...createV10Context(),
+    moduleName,
+    moduleFieldsName,
+    moduleSkeletonName,
+};
 //# sourceMappingURL=context.js.map

package/dist/renderer/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/renderer/context.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,oBAAoB,EAAiB,MAAM,4BAA4B,CAAC;AAEjF,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;AACvF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC;AAC9E,MAAM,CAAC,MAAM,OAAO,GAAkB,EAAE,GAAG,oBAAoB,EAAE,EAAE,UAAU,EAAE,gBAAgB,EAAE,CAAC"}
+{"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,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;AAClE,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"}

package/dist/renderer/index.d.ts

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

package/dist/renderer/index.js

@@ -1,5 +1,5 @@
-export { DefaultContentTypeRenderer } from './contentTypeRenderer.js';
+export { DefaultContentTypeRenderer, V10ContentTypeRenderer } from './contentTypeRenderer.js';
 export { JsDocRenderer } from './jsDocRenderer.js';
-export { TypeGuardRenderer } from './typeGuardRenderer.js';
+export { TypeGuardRenderer, V10TypeGuardRenderer } from './typeGuardRenderer.js';
 export { LocalizedContentTypeRenderer } from './localizedContentRenderer.js';
 //# sourceMappingURL=index.js.map

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,MAAM,0BAA0B,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,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,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"}

package/dist/renderer/jsDocRenderer.d.ts

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

package/dist/renderer/jsDocRenderer.js

@@ -1,4 +1,4 @@
-import { JsDocRenderer as JsDocRendererOriginal } from 'cf-content-types-generator';
+import { JsDocRenderer as JsDocRendererOriginal, } from 'cf-content-types-generator';
 import { context } from './context.js';
 export class JsDocRenderer extends JsDocRendererOriginal {
     createContext() {

package/dist/renderer/jsDocRenderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"jsDocRenderer.js","sourceRoot":"","sources":["../../src/renderer/jsDocRenderer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,IAAI,qBAAqB,EAAiB,MAAM,4BAA4B,CAAC;AACnG,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,MAAM,OAAO,aAAc,SAAQ,qBAAqB;IAC/C,aAAa;QAClB,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}
+{"version":3,"file":"jsDocRenderer.js","sourceRoot":"","sources":["../../src/renderer/jsDocRenderer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,IAAI,qBAAqB,GAEvC,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,MAAM,OAAO,aAAc,SAAQ,qBAAqB;IAC/C,aAAa;QAClB,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}

package/dist/renderer/localizedContentRenderer.d.ts

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

package/dist/renderer/typeGuardRenderer.d.ts

@@ -1,6 +1,10 @@
-import { TypeGuardRenderer as TypeGuardRendererOriginal, RenderContext, CFContentType } from 'cf-content-types-generator';
-import { SourceFile } from 'ts-morph';
+import { TypeGuardRenderer as TypeGuardRendererOriginal, V10TypeGuardRenderer as V10TypeGuardRendererOriginal, 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 {
+    createContext(): RenderContext;
+    render: (contentType: CFContentType, file: SourceFile) => void;
+}

package/dist/renderer/typeGuardRenderer.js

@@ -1,5 +1,5 @@
-import { TypeGuardRenderer as TypeGuardRendererOriginal, } from 'cf-content-types-generator';
-import { context, moduleName } from './context.js';
+import { TypeGuardRenderer as TypeGuardRendererOriginal, V10TypeGuardRenderer as V10TypeGuardRendererOriginal, renderTypeGeneric, } from 'cf-content-types-generator';
+import { context, v10context, moduleName } from './context.js';
 export class TypeGuardRenderer extends TypeGuardRendererOriginal {
     createContext() {
         return context;
@@ -29,4 +29,33 @@ export class TypeGuardRenderer extends TypeGuardRendererOriginal {
         file.formatText();
     };
 }
+export class V10TypeGuardRenderer extends V10TypeGuardRendererOriginal {
+    createContext() {
+        return v10context;
+    }
+    render = (contentType, file) => {
+        const entryInterfaceName = moduleName(contentType.sys.id);
+        file.addImportDeclaration({
+            moduleSpecifier: `contentful`,
+            namedImports: ['ChainModifiers', 'Entry', 'LocaleCode'],
+            isTypeOnly: true,
+        });
+        file.addFunction({
+            isExported: true,
+            name: renderTypeGeneric(`is${entryInterfaceName}`, 'Modifiers extends ChainModifiers', 'Locales extends LocaleCode'),
+            returnType: `entry is ${renderTypeGeneric(entryInterfaceName, 'Modifiers', 'Locales')}`,
+            parameters: [
+                {
+                    name: 'entry',
+                    type: renderTypeGeneric('Entry', 'EntrySkeletonType', 'Modifiers', 'Locales'),
+                },
+            ],
+            statements: `return entry.sys.contentType.sys.id === '${contentType.sys.id}'`,
+        });
+        file.organizeImports({
+            ensureNewLineAtEndOfFile: true,
+        });
+        file.formatText();
+    };
+}
 //# sourceMappingURL=typeGuardRenderer.js.map

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,GAG/C,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"}
+{"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jungvonmatt/contentful-typings",
-  "version": "1.12.6",
+  "version": "1.14.0",
   "main": "./dist/index.js",
   "type": "module",
   "exports": "./dist/index.js",
@@ -15,7 +15,7 @@
     "access": "public"
   },
   "engines": {
-    "node": "^14.16 || >=16.0.0"
+    "node": ">=18"
   },
   "scripts": {
     "clean": "rimraf ./dist",
@@ -37,20 +37,24 @@
   },
   "homepage": "https://github.com/jungvonmatt/contentful-ssg#readme",
   "dependencies": {
-    "@jungvonmatt/contentful-ssg": "^1.12.3",
-    "camelcase": "^7.0.1",
-    "cf-content-types-generator": "^2.9.1",
-    "commander": "^10.0.0",
-    "contentful": "^9.3.3",
-    "contentful-management": "^10.30.0",
-    "dotenv": "^16.0.3",
+    "@faker-js/faker": "^8.3.1",
+    "@jungvonmatt/contentful-ssg": "^1.14.0",
+    "cf-content-types-generator": "^2.13.1",
+    "change-case": "^5.4.2",
+    "commander": "^11.1.0",
+    "contentful": "^10.2.0",
+    "contentful-management": "^11.12.1",
+    "dotenv": "^16.3.1",
     "dotenv-expand": "^10.0.0",
     "fs-extra": "^11.1.0",
     "picocolors": "^1.0.0",
-    "prettier": "^2.8.4"
+    "prettier": "^3.2.4",
+    "read-pkg-up": "^11.0.0",
+    "semiver": "^1.1.0"
   },
   "devDependencies": {
-    "ts-morph": "^17.0.1"
+    "@types/chance": "^1.1.6",
+    "ts-morph": "^19.0.0"
   },
-  "gitHead": "02e07b8a12bed456b6609d4774d7b9bd6c4c0b98"
+  "gitHead": "4db0d37fb9851d2728628726691cd9b3becd4654"
 }

package/src/cli.ts

@@ -15,9 +15,10 @@ expand(env);
 
 type CommandArgs = {
   output: string;
-  typeguard: boolean;
-  jsdoc: boolean;
-  localized: boolean;
+  typeguard?: boolean;
+  jsdoc?: boolean;
+  localized?: boolean;
+  legacy?: boolean;
 };
 
 type CommandError = Error & {
@@ -39,7 +40,7 @@ const actionRunner =
   (fn, log = true) =>
   (...args) =>
     // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
-    fn(...args).catch((error) => {
+    fn(...args).catch((error: CommandError) => {
       errorHandler(error, !log);
     });
 
@@ -48,10 +49,11 @@ const program = new Command();
 program
   .command('generate')
   .description('Generate typescript definitions for contentful content types.')
-  .option('-o, --output <filepath>', 'Specify output file', '@types/contentful.d.ts')
+  .option('-o, --output <filepath>', 'Specify output file', '@types/contentful.ts')
   .option('-l, --localized', 'Add localized types')
   .option('-d, --jsdoc', 'Add JSDoc comments')
-  .option('-g, --typeguard ', 'Add type guards')
+  .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 ?? '';
@@ -59,11 +61,12 @@ program
         typeguard: cmd.typeguard,
         jsdoc: cmd.jsdoc,
         localized: cmd.localized,
+        legacy: cmd.legacy,
       });
 
       await outputFile(output, typings);
       console.log(pico.green(`  added: ${output}`));
-    })
+    }),
   );
 
 program.parse(process.argv);

package/src/index.ts

@@ -1,12 +1,17 @@
 /* _eslint-disable @typescript-eslint/no-unsafe-call */
-import { ContentfulConfig, ContentType } from '@jungvonmatt/contentful-ssg';
+import path from 'node:path';
+import { type ContentfulConfig, type ContentType } from '@jungvonmatt/contentful-ssg';
 import { getConfig } from '@jungvonmatt/contentful-ssg/lib/config';
 import { getEnvironment, pagedGet } from '@jungvonmatt/contentful-ssg/lib/contentful';
 import { askMissing } from '@jungvonmatt/contentful-ssg/lib/ui';
-import { CFDefinitionsBuilder, ContentTypeRenderer } from 'cf-content-types-generator';
+import { CFDefinitionsBuilder, type ContentTypeRenderer } from 'cf-content-types-generator';
+import { readPackageUp } from 'read-pkg-up';
+import semiver from 'semiver';
 
 import {
   DefaultContentTypeRenderer,
+  V10ContentTypeRenderer,
+  V10TypeGuardRenderer,
   JsDocRenderer,
   LocalizedContentTypeRenderer,
   TypeGuardRenderer,
@@ -16,23 +21,46 @@ type Options = {
   localized?: boolean;
   jsdoc?: boolean;
   typeguard?: boolean;
+  legacy?: boolean;
+};
+
+const isLegacyVersion = async (dir?: string) => {
+  try {
+    const cwd = path.join(dir || process.cwd(), 'node_modules', 'contentful');
+    const { packageJson } = await readPackageUp({ cwd });
+    // New skeleton types were released in contentful v10.0.0-beta-v10.33
+    if (
+      packageJson.name === 'contentful' &&
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
+      semiver(packageJson.version, '10.0.0-beta-v10.33') < 0
+    ) {
+      return true;
+    }
+  } catch {}
+
+  return false;
 };
 
 export const generateTypings = async (options: Options = {}) => {
-  const contentfulConfig: ContentfulConfig = (await askMissing(
+  const contentfulConfig = await askMissing(
     await getConfig({
       previewAccessToken: '-',
       accessToken: '-',
-    })
-  )) as ContentfulConfig;
+    }),
+  );
 
-  const client = await getEnvironment(contentfulConfig);
+  const client = await getEnvironment(contentfulConfig as ContentfulConfig);
 
   const { items: contentTypes } = await pagedGet<ContentType>(client, {
     method: 'getContentTypes',
   });
 
-  const renderers: ContentTypeRenderer[] = [new DefaultContentTypeRenderer()];
+  const legacyVersion =
+    typeof options.legacy === 'undefined' ? await isLegacyVersion() : options.legacy;
+
+  const renderers: ContentTypeRenderer[] = [
+    legacyVersion ? new DefaultContentTypeRenderer() : new V10ContentTypeRenderer(),
+  ];
   if (options.localized) {
     renderers.push(new LocalizedContentTypeRenderer());
   }
@@ -42,7 +70,7 @@ export const generateTypings = async (options: Options = {}) => {
   }
 
   if (options.typeguard) {
-    renderers.push(new TypeGuardRenderer());
+    renderers.push(legacyVersion ? new TypeGuardRenderer() : new V10TypeGuardRenderer());
   }
 
   const builder = new CFDefinitionsBuilder(renderers);

package/src/renderer/contentTypeRenderer.ts

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

package/src/renderer/context.ts

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

package/src/renderer/index.ts

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

package/src/renderer/jsDocRenderer.ts

@@ -1,4 +1,7 @@
-import { JsDocRenderer as JsDocRendererOriginal, RenderContext } from 'cf-content-types-generator';
+import {
+  JsDocRenderer as JsDocRendererOriginal,
+  type RenderContext,
+} from 'cf-content-types-generator';
 import { context } from './context.js';
 
 export class JsDocRenderer extends JsDocRendererOriginal {

package/src/renderer/localizedContentRenderer.ts

@@ -1,6 +1,6 @@
 import {
   LocalizedContentTypeRenderer as LocalizedContentTypeRendererOriginal,
-  RenderContext,
+  type RenderContext,
 } from 'cf-content-types-generator';
 import { context } from './context.js';
 

package/src/renderer/typeGuardRenderer.ts

@@ -1,10 +1,12 @@
 import {
   TypeGuardRenderer as TypeGuardRendererOriginal,
-  RenderContext,
-  CFContentType,
+  V10TypeGuardRenderer as V10TypeGuardRendererOriginal,
+  type RenderContext,
+  type CFContentType,
+  renderTypeGeneric,
 } from 'cf-content-types-generator';
-import { SourceFile } from 'ts-morph';
-import { context, moduleName } from './context.js';
+import { type SourceFile } from 'ts-morph';
+import { context, v10context, moduleName } from './context.js';
 
 export class TypeGuardRenderer extends TypeGuardRendererOriginal {
   public createContext(): RenderContext {
@@ -40,3 +42,42 @@ export class TypeGuardRenderer extends TypeGuardRendererOriginal {
     file.formatText();
   };
 }
+
+export class V10TypeGuardRenderer extends V10TypeGuardRendererOriginal {
+  public createContext(): RenderContext {
+    return v10context;
+  }
+
+  public render = (contentType: CFContentType, file: SourceFile): void => {
+    const entryInterfaceName = moduleName(contentType.sys.id);
+
+    file.addImportDeclaration({
+      moduleSpecifier: `contentful`,
+      namedImports: ['ChainModifiers', 'Entry', 'LocaleCode'],
+      isTypeOnly: true,
+    });
+
+    file.addFunction({
+      isExported: true,
+      name: renderTypeGeneric(
+        `is${entryInterfaceName}`,
+        'Modifiers extends ChainModifiers',
+        'Locales extends LocaleCode',
+      ),
+      returnType: `entry is ${renderTypeGeneric(entryInterfaceName, 'Modifiers', 'Locales')}`,
+      parameters: [
+        {
+          name: 'entry',
+          type: renderTypeGeneric('Entry', 'EntrySkeletonType', 'Modifiers', 'Locales'),
+        },
+      ],
+      statements: `return entry.sys.contentType.sys.id === '${contentType.sys.id}'`,
+    });
+
+    file.organizeImports({
+      ensureNewLineAtEndOfFile: true,
+    });
+
+    file.formatText();
+  };
+}