@remkoj/optimizely-graph-functions 6.0.0-pre9 → 6.0.0-rc.3

package/AGENTS.md

@@ -0,0 +1,105 @@
+# @remkoj/optimizely-graph-functions — usage
+
+`graphql-codegen` preset and plugin for Optimizely Graph. Generates typed GraphQL
+operations and fragments for querying Optimizely Content Graph.
+
+## Install
+
+```bash
+npm install --save-dev @remkoj/optimizely-graph-functions
+```
+
+## Subpath exports
+
+| Import path | Contents |
+| --- | --- |
+| `@remkoj/optimizely-graph-functions` | Plugin entry point (`plugin`, `validate`) |
+| `@remkoj/optimizely-graph-functions/preset` | Codegen preset (primary entrypoint for codegen config) |
+| `@remkoj/optimizely-graph-functions/plugin` | Standalone codegen plugin |
+| `@remkoj/optimizely-graph-functions/transform` | Document transform |
+| `@remkoj/optimizely-graph-functions/documents` | Shared Optimizely Graph fragment documents |
+| `@remkoj/optimizely-graph-functions/loader` | GraphQL document loader |
+| `@remkoj/optimizely-graph-functions/contenttype-loader` | Content-type aware loader |
+| `@remkoj/optimizely-graph-functions/generate` | Code generation utilities |
+
+## Usage in `codegen.ts`
+
+The package exposes a full codegen **preset** (not just a plugin). Use it as the `preset` value for your output target. The preset auto-discovers your component GraphQL files and injects the right fragments based on the file-name convention below.
+
+```typescript
+import type { CodegenConfig } from '@graphql-codegen/cli'
+import getSchemaInfo from '@remkoj/optimizely-graph-client/codegen'
+import OptimizelyGraphPreset, { type PresetOptions } from '@remkoj/optimizely-graph-functions/preset'
+
+const config: CodegenConfig = {
+  schema: getSchemaInfo(),             // reads env vars automatically
+  documents: ['src/**/*.graphql'],
+  generates: {
+    './gql/': {
+      preset: OptimizelyGraphPreset,
+      presetConfig: {
+        // Allow recursive fragments (requires patched visitor-plugin-common)
+        recursion: true,
+
+        // Map component GraphQL files to the correct base fragment
+        injections: [
+          { into: 'PageData',         pathRegex: 'src\/components\/cms\/.*\.page\.graphql' },
+          { into: 'PageData',         pathRegex: 'src\/components\/cms\/.*\.experience\.graphql' },
+          { into: 'BlockData',        pathRegex: 'src\/components\/cms\/.*\.block\.graphql' },
+          { into: 'BlockData',        pathRegex: 'src\/components\/cms\/.*\.component\.graphql' },
+          { into: 'BlockData',        pathRegex: 'src\/components\/cms\/.*\.section\.graphql' },
+          { into: 'ElementData',      pathRegex: 'src\/components\/cms\/.*\.element\.graphql' },
+          { into: 'IContentListItem', pathRegex: 'src\/components\/cms\/.*\.contentarea\.graphql' },
+        ],
+      } as PresetOptions,
+    },
+  },
+}
+
+export default config
+```
+
+## GraphQL file naming conventions
+
+Files discovered by `injections.pathRegex` are automatically injected into the named base fragment:
+
+| File suffix | Injected into |
+| --- | --- |
+| `*.page.graphql` | `PageData` |
+| `*.experience.graphql` | `PageData` |
+| `*.block.graphql` | `BlockData` |
+| `*.component.graphql` | `BlockData` |
+| `*.section.graphql` | `BlockData` |
+| `*.element.graphql` | `ElementData` |
+| `*.contentarea.graphql` | `IContentListItem` |
+
+Each file should contain a single named fragment that matches its content type, e.g. `fragment HeroBlockData on HeroBlock { ... }`.
+
+## Preset options (`PresetOptions`)
+
+`PresetOptions` extends `ClientPresetConfig` (from `@graphql-codegen/client-preset`) with:
+
+| Option | Default | Description |
+| --- | --- | --- |
+| `functions` | `['getContentType', 'getContentByPath', 'getContentById']` | Built-in Optimizely Graph functions to generate typed wrappers for |
+| `prettyPrintQuery` | `false` | Format generated query strings |
+| `clientPath` | `"./graphql"` | Path to the generated GraphQL client |
+| `recursion` | `false` | Enable recursive fragment support (requires patched `visitor-plugin-common`) |
+| `injections` | `[]` | Array of `{ into, pathRegex?, nameRegex? }` injection rules |
+| `cleanup` | `true` | Strip injected fragment spreads after processing |
+
+## Loading Optimizely-provided fragments
+
+The loader protocol `opti-cms:/fragments/13` fetches the built-in Optimizely Graph fragments (the preset adds this automatically; you normally do not need to add it manually):
+
+```typescript
+// Only needed when building a custom codegen target that references Optimizely fragments
+{ 'opti-cms:/fragments/13': { loader: '@remkoj/optimizely-graph-functions/loader' } }
+```
+
+## Constraints
+
+- Requires `@graphql-codegen/cli` and `@graphql-codegen/client-preset` as peer dependencies.
+- Depends on a **patched** `@graphql-codegen/visitor-plugin-common`; after `yarn install`/`upgrade` run `yarn opti-graph patches:apply`.
+- CommonJS module.
+- Use the preset (`./preset`) as the entry point, not the bare plugin, for all new projects.

package/README.md

@@ -1,4 +1,8 @@
-# Optimizely GraphQL Codegen Plugin
+# Optimizely GraphQL Codegen Plugin  <!-- omit in toc -->
+
+> [!WARNING]
+> There'll be an update of Optimizely SaaS CMS that is incompatible with all SDK versions prior to 5.1.6. If you don't upgrade, you will see empty pages (main website) and "Component not found" messages (preview).
+
 GraphQL Codegen plugin and preset which generate both the GraphQL type definitions and a few convenienece methods for useage with [Optimizely Graph Client](../optimizely-graph-client/README.md).
 
 [Release notes](https://github.com/remkoj/optimizely-dxp-clients/releases)
@@ -6,7 +10,22 @@ GraphQL Codegen plugin and preset which generate both the GraphQL type definitio
 > [!WARNING]
 > The GraphQL Codegen preset requires a patch to enable it to work with recursive queries. Make sure to run this command after every update to ensure you're using the latest patches: `yarn opti-graph patches:apply`. Adjust when used in a mono-repo to patch the correct package.json, for example: `yarn workspace frontend opti-graph patches:apply -p ../../`
 
-## Install package
+## Contents  <!-- omit in toc -->
+- [1. Install package](#1-install-package)
+- [2. Configure package](#2-configure-package)
+- [3. GraphQL Document Processing](#3-graphql-document-processing)
+  - [3.1. Allow overwriting of built-in fragments \& queries](#31-allow-overwriting-of-built-in-fragments--queries)
+  - [3.2. Injection of fragments \& queries for ContentTypes](#32-injection-of-fragments--queries-for-contenttypes)
+  - [3.3. Auto inject fragments](#33-auto-inject-fragments)
+  - [3.4. Remove fragments and spreads that target non-existing types](#34-remove-fragments-and-spreads-that-target-non-existing-types)
+  - [3.5. Dedicated Queries \& Fragments](#35-dedicated-queries--fragments)
+  - [Compiler field directive `@depend`](#compiler-field-directive-depend)
+- [4. Usage](#4-usage)
+  - [4.1. Option 1: Direct methods](#41-option-1-direct-methods)
+  - [4.2. Option 2: Enhanced Client](#42-option-2-enhanced-client)
+
+
+## 1. Install package
 To install using Yarn, use the following command:
 
 ```bash
@@ -19,7 +38,7 @@ yarn add --dev @remkoj/optimizely-graph-cli
 yarn opti-graph patches:apply
 ```
 
-## Configure package
+## 2. Configure package
 Create a codegen.ts within your application root folder (e.g. apps/frontend/codegen.ts within the example site). Within the codegen.ts create the following configuration:
 
 ```typescript
@@ -104,11 +123,46 @@ The presetConfig of the `OptimizelyGraphPreset` is an extension of the configura
 | functions | The list of GraphQL Functions that should be made available in the `functions.ts` file. When specified, this overrides the default list.<br/>*Default value: `['getContentType','getContentByPath','getContentById']`*
 | verbose | Set to `true` to enable debugging output of the preset, loader, plugin and transform |
 
+## 3. GraphQL Document Processing
+### 3.1. Allow overwriting of built-in fragments & queries
+All fragment and query names injected / generated by this package start with an underscore (for example: `_getContentById`). During the document pre-processing, all these fragments and queries will be processed with this logic:
+- If there's no query or fragment with the name without the leading underscore, it will be renamed. (i.e. `_getContentById` becomes `getContentById`)
+- If a query or fragment with the name without leading underscore does exist, the built-in version with underscore will be removed from the document set.
+
+This allows a project to overwrite built-in fragments and queries, while still ensuring type-safety.
+
+### 3.2. Injection of fragments & queries for ContentTypes
+For each content type the appropriate fragments and queries will be auto generated an injected into the document set.
+
+### 3.3. Auto inject fragments
+Dynamically build queries & fragments based upon the `injections` configuration, and the default injections from the auto-generated fragments & queries.
+
+This allows you to tell wich group of fragments you want at a given location and then during GraphQL compilation generate the full queries based upon the current content schema in Optimizely CMS and your project configuration.
+
+### 3.4. Remove fragments and spreads that target non-existing types
+Depending on the features you have enabled in your CMS, not all types might actually be present in Optimizely Graph. This logic removes these fragments and spreads from the documents. 
+
+This approach assumes you're using TypeScript, as missing, but required types or fields should cause an error in the TypeScript compilation step of you application. Hence it moves the error from GraphQL Codegen to TypeScript, allowing some of the changes to be handled in the code.
+
+### 3.5. Dedicated Queries & Fragments
+The preset automatically injects a number of fragments and documents into the generated code. These can be found in their respective document:
+
+- [`opti-cms:/queries/13`](./src/documents/queries.cms13.ts)
+- [`opti-cms:/queries/12`](./src/documents/queries.cms12.ts)
+- [`opti-cms:/fragments/13`](./src/documents/fragments.cms13.ts)
+- [`opti-cms:/fragments/12`](./src/documents/fragments.cms12.ts)
+
+### Compiler field directive `@depend`
+A compile time directive `@depend` is processed, allowing you to make selections depend on a field to present in the schema.
 
-## Usage
+For example: `componentData: item @depend(on: "ContentReference.item") {}` will remove the field selection `componentData` from the document if there's no type with the name `ContentReference` that has a field named `item`.
+
+This allows to write generic queries that can cope with differen configurations within the CMS.
+
+## 4. Usage
 After running the code generation, you can use the following API's (assuming the folder where the generated files are stored is available at `@/gql`):
 
-### Option 1: Direct methods
+### 4.1. Option 1: Direct methods
 Only the methods specified by the `functions` preset configuration are available using this method.
 
 ```typescript
@@ -123,7 +177,7 @@ const contentFromId = await getContentById(client, { guidValue: '00000000-0000-0
 const contentFromPath = await getContentByPath(client, { path: '/en' })
 ```
 
-### Option 2: Enhanced Client
+### 4.2. Option 2: Enhanced Client
 All GraphQL operations (e.g. Queries, Mutations, ...) defined within the documents are available using this method.
 
 ```typescript
@@ -138,11 +192,3 @@ const locale = Schema.Locales.En
 
 const contentItem = await client.getContentById({ guidValue: contentId, locale })
 ```
-
-## Query Fragments
-The preset automatically injects a number of fragments and documents into the generated code. These can be found in their respective document:
-
-- [`opti-cms:/queries/13`](./src/documents/queries.cms13.ts)
-- [`opti-cms:/queries/12`](./src/documents/queries.cms12.ts)
-- [`opti-cms:/fragments/13`](./src/documents/fragments.cms13.ts)
-- [`opti-cms:/fragments/12`](./src/documents/fragments.cms12.ts)

package/dist/_transform/handleDependDirective.d.ts

@@ -0,0 +1,11 @@
+import type { Types } from '@graphql-codegen/plugin-helpers';
+import type { PresetOptions } from '../types';
+/**
+ * Remove the "item" field in queries and fragments from the "ContentReference" type if it's not in the schema
+ *
+ * @param files
+ * @param options
+ * @returns
+ */
+export declare function handleDependDirective(files: Types.DocumentFile[], options: Types.PresetFnArgs<PresetOptions>): Promise<Types.DocumentFile[]>;
+export default handleDependDirective;

package/dist/_transform/handleDependDirective.js

@@ -0,0 +1,128 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleDependDirective = handleDependDirective;
+const graphql_1 = require("graphql");
+/**
+ * Remove the "item" field in queries and fragments from the "ContentReference" type if it's not in the schema
+ *
+ * @param files
+ * @param options
+ * @returns
+ */
+async function handleDependDirective(files, options) {
+    // Debug output
+    if (options.presetConfig.verbose)
+        console.log(`✨ [Optimizely] Checking ContentReference to determine if it has an "item" field`);
+    // Ouch, this is an old SaaS CMS instance, so we're going to clean this field
+    if (options.presetConfig.verbose)
+        console.log(`✨ [Optimizely] Nope it hasn't removing any reference to it`);
+    const filteredFiles = files.map((file) => {
+        let isModified = false;
+        const newDocument = file.document ? (0, graphql_1.visit)(file.document, {
+            Field: {
+                enter(node) {
+                    // Check if the field has the `depend` directive
+                    const dependDirective = node.directives?.find(x => x.name.value === 'depend');
+                    if (dependDirective) {
+                        // If so read the arguments and validate if the required "on" argument is there
+                        const args = parseArgs(dependDirective.arguments);
+                        const dependency = args.get('on');
+                        if (typeof dependency !== 'string' || dependency.length === 0)
+                            throw new Error(`The "@depend" directive requires the parameter "on" to be a non-empty string ${buildLocString(dependDirective)}`);
+                        // Parse & validate the argument
+                        const [typeName, fieldName, ...remaining] = dependency.split('.');
+                        if (remaining.length > 0)
+                            throw new Error(`The "on" parameter of the "@depend" directive must have the form "typeName.fieldName" ${buildLocString(dependDirective)}`);
+                        // Retrieve the type fields
+                        const fields = getObjectFieldNames(options.schema, typeName);
+                        isModified = true;
+                        if (!(fields?.includes(fieldName) ?? false)) {
+                            return null; // Remove the item
+                        }
+                        else {
+                            const newNode = {
+                                ...node,
+                                directives: node.directives?.filter(x => x.name.value !== 'depend')
+                            };
+                            return newNode;
+                        }
+                    }
+                }
+            }
+        }) : undefined;
+        return isModified
+            ? {
+                ...file,
+                rawSDL: newDocument ? (0, graphql_1.print)(newDocument) : undefined,
+                document: newDocument,
+            }
+            : file;
+    });
+    return filteredFiles;
+}
+exports.default = handleDependDirective;
+function buildLocString(node) {
+    if (!node.loc)
+        return "";
+    const sourceName = node.loc.source.name;
+    const startLine = node.loc.startToken.line;
+    const startChar = node.loc.startToken.column;
+    return `in ${sourceName} at line ${startLine}, position ${startChar}`;
+}
+function parseArgs(args) {
+    return args?.reduce((out, arg) => {
+        const argName = arg.name.value;
+        switch (arg.value.kind) {
+            case graphql_1.Kind.INT:
+                out.set(argName, parseInt(arg.value.value));
+                break;
+            case graphql_1.Kind.BOOLEAN:
+                out.set(argName, new Boolean(arg.value.value));
+                break;
+            case graphql_1.Kind.STRING:
+                out.set(argName, arg.value.value);
+                break;
+            default:
+                throw new Error(`Error parsing directive arguments, encountered unsupported argument kind ${arg.value.kind} for ${argName} ${buildLocString(arg)}`);
+        }
+        return out;
+    }, new Map()) ?? new Map();
+}
+function getObjectFieldNames(schema, objectName) {
+    let currentObjectName;
+    const objectFields = [];
+    let hasType = false;
+    (0, graphql_1.visit)(schema, {
+        ObjectTypeDefinition: {
+            enter(node) {
+                if (node.name.value === objectName)
+                    hasType = true;
+                currentObjectName = node.name.value;
+            },
+            leave(node) {
+                if (currentObjectName === node.name.value)
+                    currentObjectName = undefined;
+            },
+        },
+        FieldDefinition: {
+            enter(node) {
+                if (currentObjectName === objectName)
+                    objectFields.push(node.name.value);
+            },
+        },
+    });
+    return objectFields;
+}
+function isASTNode(node) {
+    return !Array.isArray(node);
+}
+function isNotNullOrUndefined(toTest) {
+    return toTest !== null && toTest !== undefined;
+}
+function isFragmentOrOperation(x) {
+    if (Array.isArray(x) || x == undefined || x == null)
+        return false;
+    return (x.kind == graphql_1.Kind.FRAGMENT_DEFINITION ||
+        x.kind == graphql_1.Kind.OPERATION_DEFINITION);
+}
+//# sourceMappingURL=handleDependDirective.js.map

package/dist/_transform/handleDependDirective.js.map

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

package/dist/_transform/injectComponentDocuments.d.ts

@@ -1,5 +1,8 @@
 import type { Types } from '@graphql-codegen/plugin-helpers';
 import type { PresetOptions } from '../types';
+export declare function getComponentDocuments(loader?: string): Promise<Types.CustomDocumentLoader[]>;
+export declare function getInjectionTargetDocuments(loader?: string): Promise<Types.CustomDocumentLoader[]>;
+export declare function injectInjectionTargets(files: Types.DocumentFile[], options: Types.PresetFnArgs<PresetOptions>): Promise<Types.DocumentFile[]>;
 /**
  * Check all fragments within the project and ensure that there's at least a fragment for every
  * content type defined in Optimizely CMS. This assumes that when overriding the fragments the

package/dist/_transform/injectComponentDocuments.js

@@ -33,27 +33,65 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getComponentDocuments = getComponentDocuments;
+exports.getInjectionTargetDocuments = getInjectionTargetDocuments;
+exports.injectInjectionTargets = injectInjectionTargets;
 exports.injectComponentDocuments = injectComponentDocuments;
 const graphql_1 = require("graphql");
-const QueryGen = __importStar(require("../contenttype-loader"));
+const generator_1 = require("../generator");
 const OptiCMS = __importStar(require("../cms"));
 const tools_1 = require("./tools");
-/**
- * Check all fragments within the project and ensure that there's at least a fragment for every
- * content type defined in Optimizely CMS. This assumes that when overriding the fragments the
- * project will ensure that the injections are correct.
- *
- * @param files
- * @param options
- * @returns
- */
-async function injectComponentDocuments(files, options) {
+const utils_1 = require("../utils");
+async function getComponentDocuments(loader = '@remkoj/optimizely-graph-functions/contenttype-loader') {
+    const componentTypes = await OptiCMS.getContentTypesList(undefined, (ct) => {
+        if (!ct.key) // The key is required
+            return false;
+        if (ct.source === 'graph' || ct.source === 'globalcontract' || ct.source === '_system') // Only CMS managed types are allowed
+            return false;
+        if (ct.isContract) // Contracts must be ignored
+            return false;
+        return true;
+    });
+    const documents = [];
+    for (const componentType of componentTypes) {
+        const vLoc = generator_1.VirtualLocation.build(componentType, { type: 'fragment', forProperty: false });
+        if (vLoc) {
+            // Inject virtual location
+            const def = {};
+            def[vLoc] = { loader };
+            documents.push(def);
+            // Get properties
+            const propertyComponentTypeNames = generator_1.DocumentGenerator.getReferencedPropertyComponents(componentType);
+            const propertyComponentTypes = (await Promise.all(propertyComponentTypeNames.map(componentTypeName => OptiCMS.getContentType(componentTypeName)))).filter(utils_1.isNotNullOrUndefined);
+            for (const propertyComponentType of propertyComponentTypes) {
+                const propVLoc = generator_1.VirtualLocation.build(propertyComponentType, { type: 'fragment', forProperty: true });
+                if (propVLoc && !documents.some(x => typeof x === 'object' && x[propVLoc])) {
+                    // Inject virtual location
+                    const def = {};
+                    def[propVLoc] = { loader };
+                    documents.push(def);
+                }
+            }
+        }
+    }
+    return documents;
+}
+async function getInjectionTargetDocuments(loader = '@remkoj/optimizely-graph-functions/contenttype-loader') {
+    const documents = [];
+    for (const injectionTarget of generator_1.VirtualLocation.getInjectionTargets()) {
+        const vLoc = generator_1.VirtualLocation.build(injectionTarget);
+        const def = {};
+        def[vLoc] = { loader };
+        documents.push(def);
+    }
+    return documents;
+}
+async function injectInjectionTargets(files, options) {
     const allFragments = (0, tools_1.getAllFragments)(files);
-    const allGraphTypes = (0, tools_1.getAllTypeNames)(options.schema);
     const addedFiles = [];
     if (options.presetConfig.verbose)
-        console.log(`✨ [Optimizely] Generating injection target fragments that have not been defined by the implementation`);
-    for (const injectionTarget of Object.getOwnPropertyNames(QueryGen.ContentTypeTarget)) {
+        console.log(`✨ [Optimizely] Generating injection target fragments`);
+    for (const injectionTarget of generator_1.VirtualLocation.getInjectionTargets()) {
         if (!allFragments.some(x => x.fragmentName === injectionTarget)) {
             const vLoc = `opti-cms:/injectiontarget/${injectionTarget}`;
             const rawSDL = `fragment ${injectionTarget} on _IContent { ...IContentData }`;
@@ -67,28 +105,44 @@ async function injectComponentDocuments(files, options) {
             });
         }
     }
+    return [...files, ...addedFiles];
+}
+/**
+ * Check all fragments within the project and ensure that there's at least a fragment for every
+ * content type defined in Optimizely CMS. This assumes that when overriding the fragments the
+ * project will ensure that the injections are correct.
+ *
+ * @param files
+ * @param options
+ * @returns
+ */
+async function injectComponentDocuments(files, options) {
+    const allFragments = (0, tools_1.getAllFragments)(files);
+    const allGraphTypes = (0, tools_1.getAllTypeNames)(options.schema);
+    const addedFiles = [];
     if (options.presetConfig.verbose)
         console.log(`✨ [Optimizely] Generating component fragments that have not been defined by the implementation`);
-    const allContentTypes = OptiCMS.getAllContentTypes(options.presetConfig.cmsClient, 100, (ct) => {
+    const allContentTypes = await OptiCMS.getContentTypes(options.presetConfig.cmsClient, (ct) => {
         return ct.key && ct.source !== 'graph' ? true : false;
     });
+    const queryGen = new generator_1.DocumentGenerator(allContentTypes);
     const propTracker = new Map();
-    for await (const contentType of allContentTypes) {
+    for (const [, contentType] of allContentTypes) {
         // Skip over content types without a key
         if (!contentType.key)
             continue;
         // Construct the type names expected to be in Graph
-        const graphType = QueryGen.getGraphType(contentType);
-        const graphPropertyType = QueryGen.getGraphPropertyType(contentType);
-        const fragmentName = QueryGen.Tools.ucFirst(graphType) + "Data";
-        const propertyFragmentName = QueryGen.Tools.ucFirst(graphPropertyType) + "Data";
+        const graphType = queryGen.getGraphType(contentType);
+        const graphPropertyType = queryGen.getGraphPropertyType(contentType);
+        const fragmentName = queryGen.getDefaultFragmentName(contentType);
+        const propertyFragmentName = queryGen.getDefaultPropertyFragmentName(contentType);
         // Check if the types exist
         const graphTypeExists = allGraphTypes.includes(graphType);
         const graphPropertyTypeExists = allGraphTypes.includes(graphPropertyType);
         // Add Component Data Fragment
         if (graphTypeExists && !allFragments.has(fragmentName)) {
-            const rawSDL = QueryGen.buildFragment(contentType, fragmentName, false, propTracker);
-            const vLoc = QueryGen.buildVirtualLocation(contentType);
+            const rawSDL = queryGen.buildFragment(contentType, fragmentName, false, propTracker);
+            const vLoc = generator_1.VirtualLocation.build(contentType);
             if (rawSDL) {
                 if (options.presetConfig.verbose)
                     console.log(`    - Generated fragment ${fragmentName} for ${contentType.key} at ${vLoc}`);
@@ -102,8 +156,8 @@ async function injectComponentDocuments(files, options) {
         }
         // Add Component Property Data Fragment
         if (graphPropertyTypeExists && contentType.baseType === '_component' && !allFragments.has(propertyFragmentName)) {
-            const rawSDL = QueryGen.buildFragment(contentType, propertyFragmentName, true, propTracker);
-            const vLoc = QueryGen.buildVirtualLocation(contentType, { forProperty: true });
+            const rawSDL = queryGen.buildFragment(contentType, propertyFragmentName, true, propTracker);
+            const vLoc = generator_1.VirtualLocation.build(contentType, { forProperty: true });
             if (rawSDL) {
                 if (options.presetConfig.verbose)
                     console.log(`    - Generated property fragment ${propertyFragmentName} for ${contentType.key} at ${vLoc}`);

package/dist/_transform/injectComponentDocuments.js.map

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

package/dist/_transform/injectPageQueries.d.ts

@@ -1,4 +1,5 @@
 import type { Types } from '@graphql-codegen/plugin-helpers';
 import type { PresetOptions } from '../types';
+export declare function getPageDocuments(loader?: string): Promise<Types.CustomDocumentLoader[]>;
 export declare function injectPageQueries(files: Types.DocumentFile[], options: Types.PresetFnArgs<PresetOptions>): Promise<Types.DocumentFile[]>;
 export default injectPageQueries;

package/dist/_transform/injectPageQueries.js

@@ -33,25 +33,58 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPageDocuments = getPageDocuments;
 exports.injectPageQueries = injectPageQueries;
 const graphql_1 = require("graphql");
-const QueryGen = __importStar(require("../contenttype-loader"));
 const OptiCMS = __importStar(require("../cms"));
 const tools_1 = require("./tools");
+const utils_1 = require("../utils");
+const generator_1 = require("../generator");
+async function getPageDocuments(loader = '@remkoj/optimizely-graph-functions/contenttype-loader') {
+    const pageTypes = OptiCMS.getContentTypesList(undefined, (ct) => {
+        if (ct.source == "graph")
+            return false;
+        return ["_page", "_experience"].includes((ct.baseType || "").toLowerCase());
+    });
+    const documents = [];
+    for (const pageType of await pageTypes) {
+        const vLoc = generator_1.VirtualLocation.build(pageType, { type: 'query' });
+        if (vLoc) {
+            const def = {};
+            def[vLoc] = { loader };
+            documents.push(def);
+        }
+        // Get properties
+        const propertyComponentTypeNames = generator_1.DocumentGenerator.getReferencedPropertyComponents(pageType);
+        const propertyComponentTypes = (await Promise.all(propertyComponentTypeNames.map(componentTypeName => OptiCMS.getContentType(componentTypeName)))).filter(utils_1.isNotNullOrUndefined);
+        for (const propertyComponentType of propertyComponentTypes) {
+            const propVLoc = generator_1.VirtualLocation.build(propertyComponentType, { type: 'fragment', forProperty: true });
+            if (propVLoc && !documents.some(x => typeof x === 'object' && x[propVLoc])) {
+                // Inject virtual location
+                const def = {};
+                def[propVLoc] = { loader };
+                documents.push(def);
+            }
+        }
+    }
+    return documents;
+}
 async function injectPageQueries(files, options) {
     if (options.presetConfig.verbose)
         console.log(`✨ [Optimizely] Generating page queries that have not been defined by the implementation`);
     const existingQueries = (0, tools_1.getAllQueries)(files);
     const existingTypes = (0, tools_1.getAllTypeNames)(options.schema);
-    const pageLevelTypes = OptiCMS.getAllContentTypes(undefined, 100, (ct) => {
+    const allTypes = OptiCMS.getContentTypes(undefined);
+    const pageLevelTypes = OptiCMS.getContentTypesList(undefined, (ct) => {
         if (ct.source == "graph")
             return false;
         return ["_page", "_experience"].includes((ct.baseType || "").toLowerCase());
     });
+    const queryGen = new generator_1.DocumentGenerator(await allTypes);
     const newFiles = [];
-    for await (const pageContentType of pageLevelTypes) {
-        const graphDataType = QueryGen.getGraphType(pageContentType);
-        const queryName = `get${QueryGen.Tools.ucFirst(graphDataType)}Data`;
+    for (const pageContentType of await pageLevelTypes) {
+        const graphDataType = queryGen.getGraphType(pageContentType);
+        const queryName = queryGen.getDefaultQueryName(pageContentType);
         // Check if the type exists in the Schema, if not skip it
         if (!existingTypes.includes(graphDataType)) {
             if (options.presetConfig.verbose)
@@ -64,8 +97,8 @@ async function injectPageQueries(files, options) {
                 console.log(`    - Skipping query generation for ${pageContentType.key}, the project already includes a definition for ${queryName}`);
             continue;
         }
-        const rawSDL = QueryGen.buildGetQuery(pageContentType, queryName);
-        const vLoc = QueryGen.buildVirtualLocation(pageContentType, { type: 'query' });
+        const rawSDL = queryGen.buildGetQuery(pageContentType, queryName);
+        const vLoc = generator_1.VirtualLocation.build(pageContentType, { type: 'query' });
         if (options.presetConfig.verbose)
             console.log(`    - Generated query for ${pageContentType.key} at ${vLoc}`);
         newFiles.push({

package/dist/_transform/injectPageQueries.js.map

@@ -1 +1 @@
-{"version":3,"file":"injectPageQueries.js","sourceRoot":"","sources":["../../src/_transform/injectPageQueries.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,8CA8CC;AApDD,qCAA+B;AAC/B,gEAAiD;AACjD,gDAAiC;AAEjC,mCAAwD;AAEjD,KAAK,UAAU,iBAAiB,CAAC,KAA2B,EAAE,OAA0C;IAC7G,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO;QAC9B,OAAO,CAAC,GAAG,CAAC,yFAAyF,CAAC,CAAA;IAExG,MAAM,eAAe,GAAG,IAAA,qBAAa,EAAC,KAAK,CAAC,CAAA;IAC5C,MAAM,aAAa,GAAG,IAAA,uBAAe,EAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAErD,MAAM,cAAc,GAAG,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE;QACvE,IAAI,EAAE,CAAC,MAAM,IAAI,OAAO;YACtB,OAAO,KAAK,CAAC;QACf,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAyB,EAAE,CAAA;IACzC,IAAI,KAAK,EAAE,MAAM,eAAe,IAAI,cAAc,EAAE,CAAC;QACnD,MAAM,aAAa,GAAG,QAAQ,CAAC,YAAY,CAAC,eAAe,CAAC,CAAA;QAC5D,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAA;QAEnE,yDAAyD;QACzD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;YAC3C,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO;gBAC9B,OAAO,CAAC,GAAG,CAAC,uCAAuC,eAAe,CAAC,GAAG,0CAA0C,aAAa,EAAE,CAAC,CAAA;YAClI,SAAQ;QACV,CAAC;QAED,6DAA6D;QAC7D,IAAI,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YACnC,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO;gBAC9B,OAAO,CAAC,GAAG,CAAC,uCAAuC,eAAe,CAAC,GAAG,mDAAmD,SAAS,EAAE,CAAC,CAAA;YACvI,SAAQ;QACV,CAAC;QAED,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,eAAe,EAAE,SAAS,CAAC,CAAA;QACjE,MAAM,IAAI,GAAG,QAAQ,CAAC,oBAAoB,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;QAC9E,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO;YAC9B,OAAO,CAAC,GAAG,CAAC,6BAA6B,eAAe,CAAC,GAAG,OAAO,IAAI,EAAE,CAAC,CAAA;QAE5E,QAAQ,CAAC,IAAI,CAAC;YACZ,MAAM;YACN,QAAQ,EAAE,IAAA,eAAK,EAAC,MAAM,CAAC;YACvB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,IAAI;SACX,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,CAAC,GAAG,KAAK,EAAE,GAAG,QAAQ,CAAC,CAAA;AAChC,CAAC;AAED,kBAAe,iBAAiB,CAAA"}
+{"version":3,"file":"injectPageQueries.js","sourceRoot":"","sources":["../../src/_transform/injectPageQueries.ts"],"names":[],"mappings":"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"}