Content workflow

.alinea/.keep

@@ -0,0 +1 @@
+# Contents of this folder are autogenerated by alinea

.esbx.ts

@@ -1,15 +1,6 @@
-import {ReporterPlugin} from '@esbx/reporter'
-import {list, report} from '@esbx/util'
-import {spawn} from 'child_process'
-import type {BuildOptions} from 'esbuild'
-import esbuild from 'esbuild'
+import {report} from '@esbx/util'
+import {getManifest} from '@esbx/workspaces'
 import fs from 'fs-extra'
-import glob from 'glob'
-import {bundleTsPlugin} from './src/dev/bundle-ts.js'
-import {cssPlugin} from './src/dev/css.js'
-import {internalPlugin} from './src/dev/internal.js'
-import {resolvePlugin} from './src/dev/resolve'
-import {sassPlugin} from './src/dev/sass.js'
 
 export const VersionTask = {
   command: 'version <semver>',
@@ -20,182 +11,3 @@ export const VersionTask = {
     report(`bumped version to ${semver}`, false)
   }
 }
-
-import {reportTime} from '@esbx/util'
-import {execSync} from 'child_process'
-import which from 'which'
-
-function createTypes() {
-  const tsc = which.sync('tsc') as string
-  return reportTime(
-    async () => {
-      execSync(tsc, {stdio: 'inherit', cwd: process.cwd()})
-    },
-    'type checking',
-    err => {
-      if (err) return `type errors found`
-      return `types built`
-    }
-  )
-}
-
-function release({
-  command,
-  watch,
-  config
-}: {
-  command: string
-  watch: boolean
-  config: Partial<BuildOptions>
-}) {
-  return {
-    command,
-    description: 'Build workspaces',
-    options: [['-w, --watch', 'Rebuild on source file changes']],
-    async action(options) {
-      if (!fs.existsSync('./dist/index.d.ts')) await createTypes()
-      const cwd = process.cwd()
-      const entryPoints = glob
-        .sync('src/**/*.{ts,tsx,js,woff2}', {cwd})
-        .filter(entry => {
-          if (entry.includes('/static/')) return false
-          if (entry.endsWith('.test.ts') || entry.endsWith('.test.tsx'))
-            return false
-          if (entry.endsWith('.stories.tsx')) return false
-          return true
-        })
-      const staticFolders = glob.sync('src/**/static', {cwd})
-      for (const folder of staticFolders) {
-        const target = folder.replace('src/', 'dist/')
-        fs.copySync(folder, target)
-      }
-      const buildOptions: BuildOptions = {
-        jsx: 'automatic',
-        format: 'esm',
-        loader: {
-          '.woff2': 'copy',
-          '.d.ts': 'copy'
-        },
-        ...config,
-        platform: 'neutral',
-        outdir: 'dist',
-        bundle: true,
-        // sourcemap: true,
-        absWorkingDir: cwd,
-        entryPoints: entryPoints,
-        mainFields: ['module', 'main'],
-        plugins: list(
-          sassPlugin,
-          cssPlugin,
-          internalPlugin,
-          resolvePlugin,
-          options.silent
-            ? undefined
-            : ReporterPlugin.configure({name: 'alinea'}),
-          bundleTsPlugin,
-          config.plugins
-        )
-      }
-      if (watch || options.watch)
-        return esbuild.context(buildOptions).then(ctx => ctx.watch())
-      return esbuild.build(buildOptions)
-    }
-  }
-}
-export const BuildTask = release({command: 'build', watch: false, config: {}})
-let devProcess
-export const DevTask = release({
-  command: 'dev',
-  watch: true,
-  config: {
-    plugins: [
-      {
-        name: 'start',
-        setup(build) {
-          build.onEnd(() => {
-            if (devProcess) return
-            devProcess = spawn('node ./dist/dev/serve.js', {
-              stdio: 'inherit',
-              shell: true
-            })
-          })
-        }
-      }
-    ]
-  }
-})
-
-export const clean = {
-  action() {
-    fs.removeSync('dist')
-    fs.removeSync('apps/web/.alinea')
-    fs.removeSync('apps/demo/.alinea')
-  }
-}
-
-import {findNodeModules} from '@esbx/util'
-import {getManifest} from '@esbx/workspaces'
-import crypto from 'crypto'
-import path from 'path'
-
-export type TestTaskConfig = {
-  globPattern?: string
-  buildOptions?: BuildOptions
-}
-
-export const TestTask = {
-  command: 'test [pattern]',
-  describe: 'Test workspaces',
-  async action(pattern?: string) {
-    const cwd = process.cwd()
-    const filter = (pattern || 'Test').toLowerCase()
-    const files = glob.sync('src/**/*.test.{ts,tsx}', {cwd})
-    const modules = files.filter(file => {
-      return path.basename(file).toLowerCase().includes(filter)
-    })
-    if (modules.length === 0) {
-      console.log(`No tests found for pattern "${filter}"`)
-      process.exit()
-    }
-    const suites = modules
-      .map(
-        (m, idx) => `
-            globalThis.UVU_INDEX = ${idx}
-            globalThis.UVU_QUEUE.push([${JSON.stringify(path.basename(m))}])
-            await import(${JSON.stringify('./' + m)})
-          `
-      )
-      .join('\n')
-    const entry = `
-        const {exec} = await import('uvu')
-        globalThis.UVU_DEFER = 1;
-        ${suites}
-        exec().catch(error => {
-          console.error(error.stack || error.message)
-          process.exit(1)
-        })
-      `
-    const external = findNodeModules(process.cwd())
-    const outfile = path.posix.join(
-      process.cwd(),
-      'node_modules',
-      crypto.randomBytes(16).toString('hex') + '.mjs'
-    )
-    await esbuild.build({
-      bundle: true,
-      format: 'esm',
-      platform: 'node',
-      external,
-      outfile,
-      banner: {
-        js: `import "data:text/javascript,process.argv.push('.bin/uvu')" // Trigger isCLI`
-      },
-      stdin: {
-        contents: entry,
-        resolveDir: process.cwd(),
-        sourcefile: 'test.js'
-      }
-    })
-    await import(`file://${outfile}`).finally(() => fs.promises.unlink(outfile))
-  }
-}

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '18'
       - uses: actions/cache@v3
         with:
           path: |

apps/demo/package.json

@@ -10,7 +10,7 @@
     "start": "next start"
   },
   "dependencies": {
-    "@alinea/content": "link:.alinea",
+    "@alinea/generated": "link:.alinea",
     "alinea": "0.0.0",
     "include-media": "^1.4.10",
     "next": "^12.2.5",

apps/demo/src/pages/api/preview.ts

@@ -1,4 +1,4 @@
-import {backend} from '@alinea/content/backend'
+import {backend} from '@alinea/generated/backend'
 import type {NextApiRequest, NextApiResponse} from 'next'
 
 export default async function handler(

apps/demo/src/pages/home.tsx

@@ -1,6 +1,5 @@
-import {Pages} from '@alinea/content'
-import {initPages} from '@alinea/content/pages'
-import {Store} from 'alinea/store'
+import {Pages} from '@alinea/generated'
+import {initPages} from '@alinea/generated/pages'
 import {GetStaticPropsContext} from 'next'
 import {DemoHome} from '../view/home/DemoHome'
 
@@ -26,6 +25,6 @@ export async function queryHome(pages: Pages) {
   return {...home, recipes}
 }
 
-export type HomeProps = Store.TypeOf<ReturnType<typeof queryHome>>
+export type HomeProps = Awaited<ReturnType<typeof queryHome>>
 
 export default DemoHome

apps/demo/src/pages/recipes/[slug].tsx

@@ -1,5 +1,5 @@
-import {Pages} from '@alinea/content'
-import {initPages} from '@alinea/content/pages'
+import {Pages} from '@alinea/generated'
+import {initPages} from '@alinea/generated/pages'
 import {GetStaticPropsContext} from 'next'
 import {Recipe} from '../../view/recipe/Recipe'
 

apps/demo/src/pages/recipes/index.tsx

@@ -1,5 +1,5 @@
-import {Pages} from '@alinea/content'
-import {initPages} from '@alinea/content/pages'
+import {Pages} from '@alinea/generated'
+import {initPages} from '@alinea/generated/pages'
 import {GetStaticPropsContext} from 'next'
 import {DemoRecipes} from '../../view/recipes/DemoRecipes'
 

apps/demo/src/view/Demo.tsx

@@ -1,5 +1,5 @@
-import {config} from '@alinea/content/config'
-import {createStore} from '@alinea/content/store'
+import {config} from '@alinea/generated/config'
+import {createStore} from '@alinea/generated/store'
 import {JWTPreviews, Server} from 'alinea/backend'
 import {IndexedDBData, IndexedDBDrafts} from 'alinea/backend/indexeddb'
 import {Dashboard, Preview} from 'alinea/dashboard'
@@ -157,7 +157,7 @@ function createDemo() {
     client,
     session: {
       user: {sub: 'anonymous'},
-      hub: client,
+      cnx: client,
       end: async () => {}
     }
   }

apps/demo/src/view/home/DemoHome.tsx

@@ -1,4 +1,4 @@
-import {Page} from '@alinea/content'
+import {Page} from '@alinea/generated'
 import {fromModule, VStack} from 'alinea/ui'
 import {DemoHeader} from '../layout/DemoHeader'
 import {DemoLayout} from '../layout/DemoLayout'

apps/demo/src/view/recipe/Recipe.tsx

@@ -1,4 +1,4 @@
-import {Page} from '@alinea/content'
+import {Page} from '@alinea/generated'
 import {fromModule} from 'alinea/ui'
 import {DemoHeader} from '../layout/DemoHeader'
 import {DemoLayout} from '../layout/DemoLayout'

apps/demo/src/view/recipes/DemoRecipes.tsx

@@ -1,4 +1,4 @@
-import {Page} from '@alinea/content'
+import {Page} from '@alinea/generated'
 import {fromModule} from 'alinea/ui'
 import css from './DemoRecipes.module.scss'
 

apps/web/content/data/docs/content/intro.json

@@ -91,7 +91,7 @@
                   "content": [
                     {
                       "type": "text",
-                      "text": "A Javascript library is generated inside the `.alinea` folder which allows us to interact with the content in JavaScript. It is linked via the `@alinea/content` package name."
+                      "text": "A Javascript library is generated inside the `.alinea` folder which allows us to interact with the content in JavaScript. It is linked via the `@alinea/generated` package name."
                     }
                   ]
                 }
@@ -102,7 +102,7 @@
         {
           "id": "28hnf59Rd5Gbite3NVvsvobRTZz",
           "type": "CodeBlock",
-          "code": "// Published content is stored in json files \n// inside the content directory\ncontent\n├ data // data root\n│ ├ index.json\n│ ├ blog.json\n│ ╰ blog\n│   ├ blog-post.json\n│   ╰ another-blog-post.json\n╰ media // media root\n  ├ image.png.json\n  ╰ file.pdf.json\n\n// A folder which is publicly available\npublic\n╰ media\n  ├ image.png\n  ╰ file.pdf\n\n// The alinea directory exports a Javascript library\n// which can be imported from @alinea/content\n.alinea\n├ ...\n├ pages.js\n├ schema.js\n╰ backend.js",
+          "code": "// Published content is stored in json files \n// inside the content directory\ncontent\n├ data // data root\n│ ├ index.json\n│ ├ blog.json\n│ ╰ blog\n│   ├ blog-post.json\n│   ╰ another-blog-post.json\n╰ media // media root\n  ├ image.png.json\n  ╰ file.pdf.json\n\n// A folder which is publicly available\npublic\n╰ media\n  ├ image.png\n  ╰ file.pdf\n\n// The alinea directory exports a Javascript library\n// which can be imported from @alinea/generated\n.alinea\n├ ...\n├ pages.js\n├ schema.js\n╰ backend.js",
           "compact": true
         }
       ]
@@ -111,4 +111,4 @@
   "alinea": {
     "index": "a0"
   }
-}
+}

apps/web/content/data/docs/content/pages.json

@@ -32,7 +32,7 @@
         {
           "id": "KSTSIoTMXMiTf6PYZeqZ6",
           "type": "CodeBlock",
-          "code": "import {initPages} from '@alinea/content/pages'\n\n// The initPages method also accepts a previewToken to query\n// drafts while previewing, see the next chapter on how to obtain one\nconst pages = initPages()"
+          "code": "import {initPages} from '@alinea/generated/pages'\n\n// The initPages method also accepts a previewToken to query\n// drafts while previewing, see the next chapter on how to obtain one\nconst pages = initPages()"
         },
         {
           "type": "heading",
@@ -136,7 +136,7 @@
         {
           "id": "IEmT75lZgxznL9v7Zq9mW",
           "type": "CodeBlock",
-          "code": "import {initPages} from '@alinea/content/pages'\n\nconst old = await pages.whereType('Animal').where(\n  animal => animal.age.greater(10)\n)\nconst teenager = await pages.whereType('Human').where(\n  human => \n    human.age.greater(10).or(\n      human.age.less(20)\n    )\n)\nconst applesOrOranges = await pages.whereType('Fruit').where(\n  fruit => fruit.title.isIn(['apple', 'orange'])\n)"
+          "code": "import {initPages} from '@alinea/generated/pages'\n\nconst old = await pages.whereType('Animal').where(\n  animal => animal.age.greater(10)\n)\nconst teenager = await pages.whereType('Human').where(\n  human => \n    human.age.greater(10).or(\n      human.age.less(20)\n    )\n)\nconst applesOrOranges = await pages.whereType('Fruit').where(\n  fruit => fruit.title.isIn(['apple', 'orange'])\n)"
         },
         {
           "type": "heading",

apps/web/content/data/docs/content/typescript.json

@@ -72,7 +72,7 @@
         {
           "id": "W2NnQtGHkU2m958whlPt_",
           "type": "CodeBlock",
-          "code": "import {Page} from '@alinea/content'"
+          "code": "import {Page} from '@alinea/generated'"
         }
       ]
     }

apps/web/content/data/docs/deploy/exporting-the-dashboard.json

@@ -80,7 +80,7 @@
               "type": "Variant",
               "name": "Next.js serverless",
               "language": "tsx",
-              "code": "// pages/api/cms/[...slug].ts\n\n// The nodeHandler utility exports the backend handle as a Node.js http handler\nimport {nodeHandler} from 'alinea/backend/router/NodeHandler'\n// The generated backend file will connect to the backend we'll configure next\nimport {backend} from '@alinea/content/backend.js'\n// Handle cms API routes at /api/cms/[...slug]\nexport default nodeHandler(backend.handle)\n// Disable the body parser middleware that next.js injects,\n// we'll let the handler deal with it\nexport const config = {api: {bodyParser: false}}"
+              "code": "// pages/api/cms/[...slug].ts\n\n// The nodeHandler utility exports the backend handle as a Node.js http handler\nimport {nodeHandler} from 'alinea/backend/router/NodeHandler'\n// The generated backend file will connect to the backend we'll configure next\nimport {backend} from '@alinea/generated/backend.js'\n// Handle cms API routes at /api/cms/[...slug]\nexport default nodeHandler(backend.handle)\n// Disable the body parser middleware that next.js injects,\n// we'll let the handler deal with it\nexport const config = {api: {bodyParser: false}}"
             }
           ]
         },

apps/web/content/data/docs/intro.json

@@ -254,14 +254,14 @@
           "content": [
             {
               "type": "text",
-              "text": "Alinea indexes the JSON files into an embedded SQLite database. Having a database with indexed fields means querying content is fast and simple. The database and tools to query content are packaged into a Javascript library that sits next to your code and is aliased to `@alinea/content`."
+              "text": "Alinea indexes the JSON files into an embedded SQLite database. Having a database with indexed fields means querying content is fast and simple. The database and tools to query content are packaged into a Javascript library that sits next to your code and is aliased to `@alinea/generated`."
             }
           ]
         },
         {
           "id": "AaQPYG-vXDXCcb-40iYeP",
           "type": "CodeBlock",
-          "code": "import {initPages} from '@alinea/content/pages'\nconst pages = initPages()\nconsole.log(\n  await pages\n    .whereType('BlogPost')\n    .where(post => post.author.is('Me'))\n    .select(post => ({title: post.title}))\n)"
+          "code": "import {initPages} from '@alinea/generated/pages'\nconst pages = initPages()\nconsole.log(\n  await pages\n    .whereType('BlogPost')\n    .where(post => post.author.is('Me'))\n    .select(post => ({title: post.title}))\n)"
         },
         {
           "id": "Gs_7cGVP61b0kBG9DKV7u",

apps/web/content/data/docs/previews/guide-setting-up-next-js-previews.json

@@ -89,7 +89,7 @@
         {
           "id": "-tfrsrqfkY0Z903mpkZnx",
           "type": "CodeBlock",
-          "code": "import {backend} from '@alinea/content/backend.js'\nimport type {NextApiRequest, NextApiResponse} from 'next'\n\nexport default async function handler(\n  req: NextApiRequest,\n  res: NextApiResponse\n) {\n  // We'll parse the previewToken from the url /api/preview?token\n  const previewToken = req.url!.split('?').pop()\n\n  // We can ask alinea to parse and validate the preview token.\n  // We'll receive the url of the entry we're currently previewing.\n  const {url} = await backend.parsePreviewToken(previewToken)\n  \n  // Store the preview token in the Next.js context so we\n  // can use it in the next route to query drafts data. Next.js\n  // uses a temporary cookie to persist this.\n  res.setPreviewData(previewToken)\n\n  // Finally redirect to the page we actually want to view\n  res.redirect(url)\n}",
+          "code": "import {backend} from '@alinea/generated/backend.js'\nimport type {NextApiRequest, NextApiResponse} from 'next'\n\nexport default async function handler(\n  req: NextApiRequest,\n  res: NextApiResponse\n) {\n  // We'll parse the previewToken from the url /api/preview?token\n  const previewToken = req.url!.split('?').pop()\n\n  // We can ask alinea to parse and validate the preview token.\n  // We'll receive the url of the entry we're currently previewing.\n  const {url} = await backend.parsePreviewToken(previewToken)\n  \n  // Store the preview token in the Next.js context so we\n  // can use it in the next route to query drafts data. Next.js\n  // uses a temporary cookie to persist this.\n  res.setPreviewData(previewToken)\n\n  // Finally redirect to the page we actually want to view\n  res.redirect(url)\n}",
           "fileName": "pages/api/preview.ts"
         },
         {
@@ -116,7 +116,7 @@
         {
           "id": "qQxOBtOwIiLwZsZXhGYN9",
           "type": "CodeBlock",
-          "code": "import {initPages} from '@alinea/content/pages'\nimport {GetStaticPropsContext} from 'next'\n\nexport async function getStaticProps(context: GetStaticPropsContext) {\n  // Pass the previewToken that we receive in previewData to initPages\n  const pages = initPages(context.previewData as string)\n\n  // Anything we query on this pages instance will reflect drafts data\n  const recipe = await pages.whereType('Recipe').first(page => page.path.is(slug))\n  return {props: recipe}\n}\n\nexport default RecipeView",
+          "code": "import {initPages} from '@alinea/generated/pages'\nimport {GetStaticPropsContext} from 'next'\n\nexport async function getStaticProps(context: GetStaticPropsContext) {\n  // Pass the previewToken that we receive in previewData to initPages\n  const pages = initPages(context.previewData as string)\n\n  // Anything we query on this pages instance will reflect drafts data\n  const recipe = await pages.whereType('Recipe').first(page => page.path.is(slug))\n  return {props: recipe}\n}\n\nexport default RecipeView",
           "fileName": "pages/recipe/[slug].tsx"
         },
         {