fix: add removeinterfacename for global as collection (#46)

* fix: add removeinterfacename for global as collection

* chore: Include dist for direct comsuption from github

* chore: remove console.log

* chore: remove console.log and build to dist

* Remove dist/

* DRY port number

* Remove console.log

---------

Co-authored-by: Jan Buchar <Teyras@gmail.com>

Author: summersmile1984

dev/app/(payload)/layout.tsx

@@ -14,12 +14,14 @@ type Args = {
   children: React.ReactNode
 }
 
-const serverFunction: ServerFunctionClient = async args =>
-  handleServerFunctions({
+const serverFunction: ServerFunctionClient = async args => {
+  'use server'
+  return handleServerFunctions({
     ...args,
     config,
     importMap,
   })
+}
 
 const Layout = ({ children }: Args) => (
   <RootLayout config={config} importMap={importMap} serverFunction={serverFunction}>

dev/blocks/MediaBlock/config.ts

@@ -0,0 +1,14 @@
+import type { Block } from 'payload'
+
+export const MediaBlock: Block = {
+  slug: 'mediaBlock',
+  interfaceName: 'MediaBlock',
+  fields: [
+    {
+      name: 'media',
+      type: 'upload',
+      relationTo: 'media',
+      required: true,
+    },
+  ],
+}

dev/collections/Pages.ts

@@ -0,0 +1,23 @@
+import type { CollectionConfig } from 'payload'
+
+import { MediaBlock } from '../blocks/MediaBlock/config.js'
+
+export const Posts: CollectionConfig = {
+  slug: 'posts',
+  admin: {
+    useAsTitle: 'title',
+    defaultColumns: ['title', 'updatedAt'],
+  },
+  fields: [
+    {
+      name: 'title',
+      type: 'text',
+      required: true,
+    },
+    {
+      name: 'content',
+      type: 'blocks',
+      blocks: [MediaBlock],
+    },
+  ],
+}

dev/collections/Posts.ts

@@ -1,3 +1,4 @@
+import { MediaBlock } from 'blocks/MediaBlock/config.js'
 import type { GlobalConfig } from 'payload'
 
 export const FeaturedPet: GlobalConfig = {
@@ -6,5 +7,11 @@ export const FeaturedPet: GlobalConfig = {
   fields: [
     { name: 'pet', type: 'relationship', relationTo: 'pets', required: true },
     { name: 'blurb', type: 'text' },
+
+    {
+      name: 'content',
+      type: 'blocks',
+      blocks: [MediaBlock],
+    },
   ],
 }

dev/globals/FeaturedPet.ts

@@ -10,6 +10,7 @@ import { testEmailAdapter } from './helpers/testEmailAdapter.js'
 import { seed } from './seed.js'
 
 import { Categories, Pets } from './collections/Pets.js'
+import { Posts } from './collections/Posts.js'
 import { Users } from './collections/Users.js'
 import { FeaturedPet } from './globals/FeaturedPet.js'
 
@@ -28,6 +29,7 @@ export default buildConfig({
     },
   },
   collections: [
+    Posts,
     Pets,
     Categories,
     Users,

dev/payload.config.ts

@@ -8,9 +8,12 @@ import open from 'open'
 
 const dirname = path.dirname(fileURLToPath(import.meta.url))
 
+const port = 3005
+
 const opts: NextServerOptions = {
   dev: true,
   dir: dirname,
+  port,
 }
 
 // @ts-expect-error next types do not import
@@ -19,11 +22,11 @@ const handle = app.getRequestHandler()
 
 await app.prepare()
 
-await open('http://localhost:3000/admin')
+await open(`http://localhost:${port}/admin`)
 
 const server = createServer((req, res) => {
   const parsedUrl = parse(req.url!, true)
   void handle(req, res, parsedUrl)
 })
 
-server.listen(3000)
+server.listen(port)

dev/server.ts

@@ -22,7 +22,7 @@
     "noEmit": true,
     "emitDeclarationOnly": false,
     "incremental": true,
-    "moduleResolution": "node",
+    "moduleResolution": "nodenext",
     "resolveJsonModule": true,
     "isolatedModules": true
   }

dev/tsconfig.json

@@ -65,7 +65,7 @@ const adjustRefTargets = (
   })
 }
 
-const removeInterfaceNames = (target: SanitizedCollectionConfig) =>
+const removeInterfaceNames = (target: SanitizedCollectionConfig | SanitizedGlobalConfig) =>
   create(target, draft =>
     visitObjectNodes(draft, (subject, key) => {
       if (key === 'interfaceName') {
@@ -90,6 +90,7 @@ const generateSchemaObject = (config: SanitizedConfig, collection: Collection):
     'text',
     undefined,
   )
+
   return {
     ...schema,
     title: collectionName(collection).singular,
@@ -494,7 +495,13 @@ const generateGlobalSchemas = (
   config: SanitizedConfig,
   global: SanitizedGlobalConfig,
 ): Record<string, JSONSchema4> => {
-  const schema = entityToJSONSchema(config, global, new Map(), 'text', undefined)
+  const schema = entityToJSONSchema(
+    config,
+    removeInterfaceNames(global),
+    new Map(),
+    'text',
+    undefined,
+  )
 
   return {
     [componentName('schemas', globalName(global))]: { ...schema, title: globalName(global) },