@eide/uniformgen 0.1.0 → 0.1.2

package/dist/commands/push.js

@@ -94,7 +94,7 @@ async function createEntityModel(apiUrl, accessToken, tenantId, projectId, model
                     },
                     modes: model.modes,
                     editorMode: model.editorMode,
-                    pages: model.pages,
+                    extensions: model.extensions,
                     hooks: model.hooks,
                 },
             },
@@ -147,7 +147,7 @@ async function updateEntityModelSchema(apiUrl, accessToken, tenantId, projectId,
                     },
                     modes: model.modes,
                     editorMode: model.editorMode,
-                    pages: model.pages,
+                    extensions: model.extensions,
                     hooks: model.hooks,
                     changeDescription: `Updated via uniformgen push`,
                 },

package/dist/fetcher/fetch-schemas.d.ts.map

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

package/dist/fetcher/fetch-schemas.js

@@ -20,21 +20,7 @@ const GET_ENTITY_MODELS = gql `
         modes
         isSystemModel
         isInfrastructure
-        pages {
-          enabled
-          sitemap {
-            changefreq
-            priority
-          }
-          defaultTemplate {
-            modelKey
-            naturalKey
-          }
-          parentModels {
-            modelKey
-            cascadeDelete
-          }
-        }
+        extensions
         hooks
         metadataSchema
       }

package/dist/generators/cms/route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../src/generators/cms/route.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAElE;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAE7D;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,CAEtE;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,cAAc,EAAE,WAAW,EAAE,GAAG,MAAM,CA2L/E;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,cAAc,EAAE,WAAW,EAAE,GAAG,MAAM,CAmM/E"}
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../src/generators/cms/route.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAElE;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAE7D;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,CAEtE;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,cAAc,EAAE,WAAW,EAAE,GAAG,MAAM,CAsM/E;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,cAAc,EAAE,WAAW,EAAE,GAAG,MAAM,CA0M/E"}

package/dist/generators/cms/route.js

@@ -35,6 +35,7 @@ export function generateResolveRouteReact(routableModels) {
  * @generated by UniformGen - DO NOT EDIT MANUALLY
  */
 
+import { useMemo } from 'react';
 import { useQuery, type QueryHookOptions } from '@apollo/client';
 import { gql } from '@apollo/client';
 import type {
@@ -181,12 +182,22 @@ export function useResolveRoute(
 ) {
   const { queryOptions, referenceOptions } = options ?? {};
 
+  // Build contexts object from variant context fields
+  // NOTE: Security-sensitive fields (authenticated, customerId, userData) are injected server-side
+  const contexts = useMemo(() => {
+    const ctx: Record<string, unknown> = {};
+    if (context?.device) ctx.device = context.device;
+    if (context?.region) ctx.region = context.region;
+    if (context?.contexts) Object.assign(ctx, context.contexts);
+    return Object.keys(ctx).length > 0 ? ctx : undefined;
+  }, [context?.device, context?.region, context?.contexts]);
+
   const result = useQuery(RESOLVE_ROUTE_QUERY, {
     ...queryOptions,
     variables: {
       path,
       locale: context?.locale,
-      contexts: context?.contexts,
+      contexts,
       referenceOptions,
     },
     skip: !path,
@@ -384,12 +395,19 @@ export async function resolveRoute(
     referenceOptions?: ReferenceResolutionOptions;
   }
 ): Promise<ResolvedRoute | null> {
+  // Build contexts object from variant context fields
+  // NOTE: Security-sensitive fields (authenticated, customerId, userData) are injected server-side
+  const contexts: Record<string, unknown> = {};
+  if (context?.device) contexts.device = context.device;
+  if (context?.region) contexts.region = context.region;
+  if (context?.contexts) Object.assign(contexts, context.contexts);
+
   const result = await client.request<{ resolveRoute: ResolvedRoute | null }>(
     RESOLVE_ROUTE_QUERY,
     {
       path,
       locale: context?.locale,
-      contexts: context?.contexts,
+      contexts: Object.keys(contexts).length > 0 ? contexts : undefined,
       referenceOptions: options?.referenceOptions,
     }
   );

package/dist/generators/resolve/platform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../../../src/generators/resolve/platform.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAuB,MAAM,gCAAgC,CAAC;AA6FvF;;GAEG;AACH,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,WAAW,EAClB,UAAU,EAAE,WAAW,EAAE,GACxB,MAAM,CAyMR;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,WAAW,EAClB,UAAU,EAAE,WAAW,EAAE,GACxB,MAAM,CAwIR;AAED;;GAEG;AACH,wBAAgB,iCAAiC,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAoC/E;AAED;;GAEG;AACH,wBAAgB,iCAAiC,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAyC/E"}
+{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../../../src/generators/resolve/platform.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAuB,MAAM,gCAAgC,CAAC;AA6FvF;;GAEG;AACH,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,WAAW,EAClB,UAAU,EAAE,WAAW,EAAE,GACxB,MAAM,CAoNR;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,WAAW,EAClB,UAAU,EAAE,WAAW,EAAE,GACxB,MAAM,CA+IR;AAED;;GAEG;AACH,wBAAgB,iCAAiC,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAoC/E;AAED;;GAEG;AACH,wBAAgB,iCAAiC,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAyC/E"}

package/dist/generators/resolve/platform.js

@@ -112,6 +112,7 @@ export function generatePlatformResolveReact(model, _allModels) {
     lines.push(` */`);
     lines.push('');
     // Imports
+    lines.push(`import { useMemo } from 'react';`);
     lines.push(`import { useQuery, type QueryHookOptions } from '@apollo/client';`);
     lines.push(`import { gql } from '@apollo/client';`);
     lines.push(`import type { ${dataTypeName} } from '../../types/models/${model.key}.js';`);
@@ -261,12 +262,22 @@ export function generatePlatformResolveReact(model, _allModels) {
     lines.push(`  context?: VariantContext,`);
     lines.push(`  options?: Omit<QueryHookOptions, 'variables'>`);
     lines.push(`) {`);
+    lines.push(`  // Build contexts object from variant context fields`);
+    lines.push(`  // NOTE: Security-sensitive fields (authenticated, customerId, userData) are injected server-side`);
+    lines.push(`  const contexts = useMemo(() => {`);
+    lines.push(`    const ctx: Record<string, unknown> = {};`);
+    lines.push(`    if (context?.device) ctx.device = context.device;`);
+    lines.push(`    if (context?.region) ctx.region = context.region;`);
+    lines.push(`    if (context?.contexts) Object.assign(ctx, context.contexts);`);
+    lines.push(`    return Object.keys(ctx).length > 0 ? ctx : undefined;`);
+    lines.push(`  }, [context?.device, context?.region, context?.contexts]);`);
+    lines.push('');
     lines.push(`  const result = useQuery(RESOLVE_${typeName.toUpperCase()}_QUERY, {`);
     lines.push(`    ...options,`);
     lines.push(`    variables: {`);
     lines.push(`      naturalKey,`);
     lines.push(`      locale: context?.locale,`);
-    lines.push(`      contexts: context?.contexts,`);
+    lines.push(`      contexts,`);
     lines.push(`    },`);
     lines.push(`    skip: !naturalKey,`);
     lines.push(`  });`);
@@ -386,10 +397,17 @@ export function generatePlatformResolveRemix(model, _allModels) {
     lines.push(`  naturalKey: string,`);
     lines.push(`  context?: VariantContext`);
     lines.push(`): Promise<Resolved${typeName} | null> {`);
+    lines.push(`  // Build contexts object from variant context fields`);
+    lines.push(`  // NOTE: Security-sensitive fields (authenticated, customerId, userData) are injected server-side`);
+    lines.push(`  const contexts: Record<string, unknown> = {};`);
+    lines.push(`  if (context?.device) contexts.device = context.device;`);
+    lines.push(`  if (context?.region) contexts.region = context.region;`);
+    lines.push(`  if (context?.contexts) Object.assign(contexts, context.contexts);`);
+    lines.push('');
     lines.push(`  const result = await client.request<{ resolveEntity: any }>(RESOLVE_${typeName.toUpperCase()}_QUERY, {`);
     lines.push(`    naturalKey,`);
     lines.push(`    locale: context?.locale,`);
-    lines.push(`    contexts: context?.contexts,`);
+    lines.push(`    contexts: Object.keys(contexts).length > 0 ? contexts : undefined,`);
     lines.push(`  });`);
     lines.push(`  if (!result.resolveEntity) return null;`);
     lines.push(`  const data = result.resolveEntity;`);

package/dist/generators/types/field-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"field-types.d.ts","sourceRoot":"","sources":["../../../src/generators/types/field-types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,wBAAgB,sBAAsB,IAAI,MAAM,CAmoB/C"}
+{"version":3,"file":"field-types.d.ts","sourceRoot":"","sources":["../../../src/generators/types/field-types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,wBAAgB,sBAAsB,IAAI,MAAM,CA2oB/C"}

package/dist/generators/types/field-types.js

@@ -219,12 +219,20 @@ export interface SortInput {
  * Used to select the appropriate variant based on user context
  *
  * Context dimensions are configured in the CMS as "context" entities.
- * Common contexts include: device, region, market, customerId, etc.
+ * You can pass common contexts as top-level properties for convenience,
+ * or use the generic \`contexts\` object for custom context dimensions.
+ *
+ * NOTE: Security-sensitive fields (authenticated, customerId, userData) are
+ * injected server-side by middleware and should NOT be passed from the client.
  */
 export interface VariantContext {
   /** Locale code for translation resolution (e.g., 'en-US', 'ja-JP') */
   locale?: string;
-  /** Context dimensions for variant selection (dynamic, configured in CMS) */
+  /** Device type for variant selection (e.g., 'mobile', 'desktop', 'tablet') */
+  device?: string;
+  /** Region for variant selection (e.g., 'us', 'eu', 'apac') */
+  region?: string;
+  /** Generic context dimensions for variant selection (custom contexts configured in CMS) */
   contexts?: Record<string, unknown>;
 }
 

package/dist/graphql/generated/graphql.d.ts

@@ -737,8 +737,12 @@ export type AvailabilityResult = {
  */
 export type AvailableContext = {
     __typename?: 'AvailableContext';
+    /** Built-in values for contexts with fixed values (e.g., ['desktop', 'mobile', 'tablet']) */
+    builtInValues?: Maybe<Array<Scalars['String']['output']>>;
     /** Description for admin UI */
     description?: Maybe<Scalars['String']['output']>;
+    /** Entity model key for entity-backed contexts (e.g., 'locale', 'shopify-market') */
+    entityModelKey?: Maybe<Scalars['String']['output']>;
     /** Whether this is a system context (code-defined, not user-editable) */
     isSystem: Scalars['Boolean']['output'];
     /** Context key (e.g., 'device', 'market') */
@@ -919,14 +923,14 @@ export type BillingOverviewMetrics = {
 export type BillingPackageLimit = {
     __typename?: 'BillingPackageLimit';
     id: Scalars['ID']['output'];
-    includedQuantity?: Maybe<Scalars['Int']['output']>;
-    maxQuantity?: Maybe<Scalars['Int']['output']>;
+    includedQuantity?: Maybe<Scalars['Float']['output']>;
+    maxQuantity?: Maybe<Scalars['Float']['output']>;
     metric: BillingMetric;
     overagePriceCents?: Maybe<Scalars['Int']['output']>;
 };
 export type BillingPackageLimitInput = {
-    includedQuantity?: InputMaybe<Scalars['Int']['input']>;
-    maxQuantity?: InputMaybe<Scalars['Int']['input']>;
+    includedQuantity?: InputMaybe<Scalars['Float']['input']>;
+    maxQuantity?: InputMaybe<Scalars['Float']['input']>;
     metric: BillingMetric;
     overagePriceCents?: InputMaybe<Scalars['Int']['input']>;
 };
@@ -954,16 +958,16 @@ export type BillingPlan = {
 export type BillingPlanLimit = {
     __typename?: 'BillingPlanLimit';
     id: Scalars['ID']['output'];
-    includedQuantity: Scalars['Int']['output'];
-    maxQuantity?: Maybe<Scalars['Int']['output']>;
+    includedQuantity: Scalars['Float']['output'];
+    maxQuantity?: Maybe<Scalars['Float']['output']>;
     metric: BillingMetric;
     overagePriceCents?: Maybe<Scalars['Int']['output']>;
     overageUnitSize: Scalars['Int']['output'];
     stripePriceId?: Maybe<Scalars['String']['output']>;
 };
 export type BillingPlanLimitInput = {
-    includedQuantity: Scalars['Int']['input'];
-    maxQuantity?: InputMaybe<Scalars['Int']['input']>;
+    includedQuantity: Scalars['Float']['input'];
+    maxQuantity?: InputMaybe<Scalars['Float']['input']>;
     metric: BillingMetric;
     overagePriceCents?: InputMaybe<Scalars['Int']['input']>;
     overageUnitSize?: InputMaybe<Scalars['Int']['input']>;
@@ -5390,8 +5394,8 @@ export type PublicBillingPlan = {
 };
 export type PublicBillingPlanLimit = {
     __typename?: 'PublicBillingPlanLimit';
-    includedQuantity: Scalars['Int']['output'];
-    maxQuantity?: Maybe<Scalars['Int']['output']>;
+    includedQuantity: Scalars['Float']['output'];
+    maxQuantity?: Maybe<Scalars['Float']['output']>;
     metric: BillingMetric;
 };
 /** A publish batch containing multiple versions to publish together */
@@ -5809,8 +5813,8 @@ export type Query = {
     recentlyOpened: Array<RecentlyOpenedItem>;
     /** Get a single redirect by ID */
     redirect?: Maybe<Redirect>;
-    /** List all redirects for the project */
-    redirects: Array<Redirect>;
+    /** List all redirects for the project with pagination */
+    redirects: RedirectsConnection;
     /**
      * Get all repeatable (cron) jobs across all queues.
      * Platform admin only.
@@ -5892,6 +5896,8 @@ export type Query = {
     tenant?: Maybe<Tenant>;
     tenantBillingStatus: TenantBillingStatusResult;
     tenants: TenantList;
+    /** List unified redirects (manual + route aliases) with pagination */
+    unifiedRedirects: UnifiedRedirectsConnection;
     /**
      * Get unread notification count for badge.
      * Uses headers for user context.
@@ -6281,6 +6287,7 @@ export type QueryRedirectsArgs = {
     activeOnly?: InputMaybe<Scalars['Boolean']['input']>;
     limit?: InputMaybe<Scalars['Int']['input']>;
     offset?: InputMaybe<Scalars['Int']['input']>;
+    search?: InputMaybe<Scalars['String']['input']>;
 };
 export type QueryResolutionDistributionArgs = {
     dateRange: DateRangeInput;
@@ -6370,6 +6377,12 @@ export type QueryTenantsArgs = {
     offset?: InputMaybe<Scalars['Int']['input']>;
     search?: InputMaybe<Scalars['String']['input']>;
 };
+export type QueryUnifiedRedirectsArgs = {
+    limit?: InputMaybe<Scalars['Int']['input']>;
+    offset?: InputMaybe<Scalars['Int']['input']>;
+    search?: InputMaybe<Scalars['String']['input']>;
+    type?: InputMaybe<UnifiedRedirectType>;
+};
 export type QueryValidateInvitationArgs = {
     token: Scalars['String']['input'];
 };
@@ -6549,6 +6562,16 @@ export type Redirect = {
     targetPattern: Scalars['String']['output'];
     updatedAt: Scalars['DateTime']['output'];
 };
+/** Connection type for paginated redirects */
+export type RedirectsConnection = {
+    __typename?: 'RedirectsConnection';
+    /** Whether there are more items to fetch */
+    hasMore: Scalars['Boolean']['output'];
+    /** List of redirects */
+    items: Array<Redirect>;
+    /** Total count of redirects matching the filter */
+    total: Scalars['Int']['output'];
+};
 /** Reference resolution options */
 export type ReferenceResolutionOptionsInput = {
     /** Maximum depth for nested resolution (null = unlimited with cycle detection) */
@@ -7674,6 +7697,55 @@ export type TypographyVariantInput = {
     name: Scalars['String']['input'];
     textTransform?: InputMaybe<Scalars['String']['input']>;
 };
+/** Unified redirect record combining manual redirects and route aliases */
+export type UnifiedRedirect = {
+    __typename?: 'UnifiedRedirect';
+    /** Entity type (route alias only) */
+    entityType?: Maybe<Scalars['String']['output']>;
+    /** Number of times this redirect has been used (manual only) */
+    hitCount?: Maybe<Scalars['Int']['output']>;
+    /** Unique identifier */
+    id: Scalars['ID']['output'];
+    /** Last time this redirect was matched (manual only) */
+    lastHitAt?: Maybe<Scalars['DateTime']['output']>;
+    /** Priority for matching (manual only) */
+    priority?: Maybe<Scalars['Int']['output']>;
+    /** Optional reason/note (manual only) */
+    reason?: Maybe<Scalars['String']['output']>;
+    /** Source URL pattern */
+    source: Scalars['String']['output'];
+    /** HTTP status code */
+    statusCode: Scalars['Int']['output'];
+    /** Target URL pattern */
+    target: Scalars['String']['output'];
+    /** Type of redirect */
+    type: UnifiedRedirectType;
+};
+/** Counts of redirects by type */
+export type UnifiedRedirectCounts = {
+    __typename?: 'UnifiedRedirectCounts';
+    /** Number of manual redirects */
+    manual: Scalars['Int']['output'];
+    /** Number of route aliases */
+    routeAlias: Scalars['Int']['output'];
+};
+/** Type of redirect */
+export declare enum UnifiedRedirectType {
+    Manual = "MANUAL",
+    RouteAlias = "ROUTE_ALIAS"
+}
+/** Connection type for unified redirects with pagination */
+export type UnifiedRedirectsConnection = {
+    __typename?: 'UnifiedRedirectsConnection';
+    /** Counts by type */
+    counts: UnifiedRedirectCounts;
+    /** Whether there are more items */
+    hasMore: Scalars['Boolean']['output'];
+    /** List of unified redirects */
+    items: Array<UnifiedRedirect>;
+    /** Total count matching the filter */
+    total: Scalars['Int']['output'];
+};
 /** Input for unpublishing an entity record variant */
 export type UnpublishEntityRecordVariantInput = {
     variantId: Scalars['ID']['input'];
@@ -7934,9 +8006,9 @@ export type UsageLimitStatus = {
 };
 export type UsageMetricValue = {
     __typename?: 'UsageMetricValue';
-    current: Scalars['Int']['output'];
-    included: Scalars['Int']['output'];
-    max?: Maybe<Scalars['Int']['output']>;
+    current: Scalars['Float']['output'];
+    included: Scalars['Float']['output'];
+    max?: Maybe<Scalars['Float']['output']>;
     metric: BillingMetric;
     percentUsed: Scalars['Float']['output'];
 };