Skip to content

Commit

Permalink
fix: grofmt bug, object modei naked groq synntax error
Browse files Browse the repository at this point in the history
  • Loading branch information
niklas-may committed Sep 24, 2023
1 parent 81b0565 commit 9961262
Show file tree
Hide file tree
Showing 24 changed files with 393 additions and 262 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"commander": "^11.0.0",
"consola": "^3.2.3",
"defu": "^6.1.2",
"groqfmt-nodejs": "^0.0.6",
"groqfmt-nodejs": "^1.0.0",
"prettier": "^3.0.3",
"rimraf": "^5.0.1",
"serialize-javascript": "^6.0.1",
Expand Down
14 changes: 14 additions & 0 deletions playground/components/Video.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import React, {FC, ReactElement} from 'react'
import "./styles.css";

interface Props {
src: string
}

export const Video = ({src}: Props) => {
return (
<div style={{width: '100%', height: '100%'}}>
<video src={src} playsInline muted autoPlay loop style={{objectFit: 'cover'}} />
</div>
)
}
90 changes: 80 additions & 10 deletions playground/generator-output/queries/get-page-by-slug.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,80 @@
import {
inlineResolver0,
inlineResolver1,
localeString,
inlineResolver2,
} from "../resolver";

// prettier-ignore
export const getPageBySlug = /* groq */`
*[_type == "page" && slug.current == $slug] { ..., ${inlineResolver0("seoTitle")}, ${inlineResolver1("pageHeader")}, gallery { ..., ${localeString("sectionTitle")}, slides[] { ..., slide { ..., ${inlineResolver2("title")} } } }, sections[] { ..., gallerySection { ..., ${localeString("sectionTitle")}, slides[] { ..., slide { ..., ${localeString("title")} } } }, textSection { ..., ${localeString("title")} }, featuresSection { ..., ${localeString("title")}, ${localeString("subtitle")} } } }[0] `
export const getPageBySlug = /* groq */ `
*[_type == "page" && slug.current == $slug] {
...,
"pageHeader": {
"title": pageHeader.title,
"subtitle": pageHeader.subtitle
},
featuredImage {
_type,
type,
type == "image" => {
image {
"title": asset->.title,
"altText": asset->.altText,
"src": asset->.url,
"metaData": {
"crop": crop,
"hotspot": hotspot,
"width": asset->.metadata.dimensions.width,
"height": asset->.metadata.dimensions.height
}
}
},
type == "video" => {
"player": player.asset-> {
"playbackId": playbackId,
"ratio": data.aspect_ratio,
thumbTime
},
"mood": mood.asset-> {
"playbackId": playbackId,
"ratio": data.aspect_ratio
}
}
},
"seoTitle": coalesce(seoTitle[$lang], seoTitle.en),
sections[] {
...,
_type == "gallerySection" => {
...,
"sectionTitle": coalesce(sectionTitle[$lang], sectionTitle.en),
slides[] {
...,
slide {
_type,
type,
type == "image" => {
image {
"title": asset->.title,
"altText": asset->.altText,
"src": asset->.url,
"metaData": {
"crop": crop,
"hotspot": hotspot,
"width": asset->.metadata.dimensions.width,
"height": asset->.metadata.dimensions.height
}
}
},
type == "video" => {
"player": player.asset-> {
"playbackId": playbackId,
"ratio": data.aspect_ratio,
thumbTime
},
"mood": mood.asset-> {
"playbackId": playbackId,
"ratio": data.aspect_ratio
}
}
}
}
},
_type == "textSection" => {
...,
"title": coalesce(title[$lang], title.en)
}
}
}[0]
`;
90 changes: 80 additions & 10 deletions playground/generator-output/queries/get-pages.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,80 @@
import {
inlineResolver0,
inlineResolver1,
localeString,
inlineResolver2,
} from "../resolver";

// prettier-ignore
export const getPages = /* groq */`
*[_type == "page"] { ..., ${inlineResolver0("seoTitle")}, ${inlineResolver1("pageHeader")}, gallery { ..., ${localeString("sectionTitle")}, slides[] { ..., slide { ..., ${inlineResolver2("title")} } } }, sections[] { ..., gallerySection { ..., ${localeString("sectionTitle")}, slides[] { ..., slide { ..., ${localeString("title")} } } }, textSection { ..., ${localeString("title")} }, featuresSection { ..., ${localeString("title")}, ${localeString("subtitle")} } } }[0] `
export const getPages = /* groq */ `
*[_type == "page"] {
...,
"pageHeader": {
"title": pageHeader.title,
"subtitle": pageHeader.subtitle
},
featuredImage {
_type,
type,
type == "image" => {
image {
"title": asset->.title,
"altText": asset->.altText,
"src": asset->.url,
"metaData": {
"crop": crop,
"hotspot": hotspot,
"width": asset->.metadata.dimensions.width,
"height": asset->.metadata.dimensions.height
}
}
},
type == "video" => {
"player": player.asset-> {
"playbackId": playbackId,
"ratio": data.aspect_ratio,
thumbTime
},
"mood": mood.asset-> {
"playbackId": playbackId,
"ratio": data.aspect_ratio
}
}
},
"seoTitle": coalesce(seoTitle[$lang], seoTitle.en),
sections[] {
...,
_type == "gallerySection" => {
...,
"sectionTitle": coalesce(sectionTitle[$lang], sectionTitle.en),
slides[] {
...,
slide {
_type,
type,
type == "image" => {
image {
"title": asset->.title,
"altText": asset->.altText,
"src": asset->.url,
"metaData": {
"crop": crop,
"hotspot": hotspot,
"width": asset->.metadata.dimensions.width,
"height": asset->.metadata.dimensions.height
}
}
},
type == "video" => {
"player": player.asset-> {
"playbackId": playbackId,
"ratio": data.aspect_ratio,
thumbTime
},
"mood": mood.asset-> {
"playbackId": playbackId,
"ratio": data.aspect_ratio
}
}
}
}
},
_type == "textSection" => {
...,
"title": coalesce(title[$lang], title.en)
}
}
}[0]
`;
4 changes: 0 additions & 4 deletions playground/generator-output/resolver/index.ts

This file was deleted.

4 changes: 0 additions & 4 deletions playground/generator-output/resolver/inline-resolver0.ts

This file was deleted.

4 changes: 0 additions & 4 deletions playground/generator-output/resolver/inline-resolver1.ts

This file was deleted.

4 changes: 0 additions & 4 deletions playground/generator-output/resolver/inline-resolver2.ts

This file was deleted.

4 changes: 0 additions & 4 deletions playground/generator-output/resolver/locale-string.ts

This file was deleted.

3 changes: 1 addition & 2 deletions playground/sanity-generator.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ export default createConfig(
},
},
{
inlineResolver: false,
trim: true,
inlineResolver: true,
outPath: path.resolve(__dirname, './generator-output'),
},
)
19 changes: 19 additions & 0 deletions playground/sanity.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ import {defineConfig} from 'sanity'
import {deskTool} from 'sanity/desk'
import {visionTool} from '@sanity/vision'
import {schemaTypes} from './schemas'
import { getPages } from './generator-output/queries/get-pages'

import { createClient } from '@sanity/client'


export default defineConfig({
name: 'default',
Expand All @@ -17,5 +21,20 @@ export default defineConfig({
},
})

const client = createClient({
projectId: "gmpiajy6",
dataset: process.env.SANITY_STUDIO_DATASET!,
apiVersion: "2023-09-23",
useCdn: false,
})

async function main(){
const res = await client.fetch(getPages, {lang: "en"})
console.log(res)
}
main()





Loading

0 comments on commit 9961262

Please sign in to comment.