redscript-mc 1.1.0 → 1.2.0

package/src/events/types.ts

@@ -0,0 +1,69 @@
+import type { TypeNode } from '../ast/types'
+
+export const EVENT_TYPES = {
+  PlayerDeath: {
+    tag: 'rs.just_died',
+    params: ['player: Player'],
+    detection: 'scoreboard',
+  },
+  PlayerJoin: {
+    tag: 'rs.just_joined',
+    params: ['player: Player'],
+    detection: 'tag',
+  },
+  BlockBreak: {
+    tag: 'rs.just_broke_block',
+    params: ['player: Player', 'block: string'],
+    detection: 'advancement',
+  },
+  EntityKill: {
+    tag: 'rs.just_killed',
+    params: ['player: Player'],
+    detection: 'scoreboard',
+  },
+  ItemUse: {
+    tag: 'rs.just_used_item',
+    params: ['player: Player'],
+    detection: 'scoreboard',
+  },
+} as const
+
+export type EventTypeName = keyof typeof EVENT_TYPES
+
+export interface EventParamSpec {
+  name: string
+  type: TypeNode
+}
+
+export function isEventTypeName(value: string): value is EventTypeName {
+  return value in EVENT_TYPES
+}
+
+export function getEventParamSpecs(eventType: EventTypeName): EventParamSpec[] {
+  return EVENT_TYPES[eventType].params.map(parseEventParam)
+}
+
+function parseEventParam(spec: string): EventParamSpec {
+  const match = spec.match(/^([A-Za-z_][A-Za-z0-9_]*)\s*:\s*([A-Za-z_][A-Za-z0-9_]*)$/)
+  if (!match) {
+    throw new Error(`Invalid event parameter spec: ${spec}`)
+  }
+
+  const [, name, typeName] = match
+  return {
+    name,
+    type: toTypeNode(typeName),
+  }
+}
+
+function toTypeNode(typeName: string): TypeNode {
+  if (typeName === 'Player') {
+    return { kind: 'entity', entityType: 'Player' }
+  }
+
+  if (typeName === 'string' || typeName === 'int' || typeName === 'bool' || typeName === 'float' || typeName === 'void' || typeName === 'BlockPos' || typeName === 'byte' || typeName === 'short' || typeName === 'long' || typeName === 'double') {
+    return { kind: 'named', name: typeName }
+  }
+
+  return { kind: 'struct', name: typeName }
+}

package/src/index.ts

@@ -19,7 +19,7 @@ import {
   generateDatapackWithStats,
   DatapackFile,
 } from './codegen/mcfunction'
-import { preprocessSource } from './compile'
+import { preprocessSource, preprocessSourceWithMetadata } from './compile'
 import type { IRModule } from './ir/types'
 import type { Program } from './ast/types'
 import type { DiagnosticError } from './diagnostics'
@@ -54,7 +54,8 @@ export function compile(source: string, options: CompileOptions = {}): CompileRe
   const shouldOptimize = options.optimize ?? true
   const shouldTypeCheck = options.typeCheck ?? true
   const filePath = options.filePath
-  const preprocessedSource = preprocessSource(source, { filePath })
+  const preprocessed = preprocessSourceWithMetadata(source, { filePath })
+  const preprocessedSource = preprocessed.source
 
   // Lexing
   const tokens = new Lexer(preprocessedSource, filePath).tokenize()
@@ -70,7 +71,7 @@ export function compile(source: string, options: CompileOptions = {}): CompileRe
   }
 
   // Lowering to IR
-  const lowering = new Lowering(namespace)
+  const lowering = new Lowering(namespace, preprocessed.ranges)
   const ir = lowering.lower(ast)
 
   let optimizedIR: IRModule = ir

package/src/ir/types.ts

@@ -107,6 +107,10 @@ export interface IRFunction {
     kind: 'advancement' | 'craft' | 'death' | 'login' | 'join_team'
     value?: string
   }
+  eventHandler?: {
+    eventType: string
+    tag: string
+  }
 }
 
 // ---------------------------------------------------------------------------

package/src/lexer/index.ts

@@ -15,7 +15,7 @@ import { DiagnosticError } from '../diagnostics'
 export type TokenKind =
   // Keywords
   | 'fn' | 'let' | 'const' | 'if' | 'else' | 'while' | 'for' | 'foreach' | 'match'
-  | 'return' | 'as' | 'at' | 'in' | 'struct' | 'enum' | 'trigger' | 'namespace'
+  | 'return' | 'as' | 'at' | 'in' | 'is' | 'struct' | 'impl' | 'enum' | 'trigger' | 'namespace'
   | 'execute' | 'run' | 'unless'
   // Types
   | 'int' | 'bool' | 'float' | 'string' | 'void'
@@ -75,7 +75,9 @@ const KEYWORDS: Record<string, TokenKind> = {
   as: 'as',
   at: 'at',
   in: 'in',
+  is: 'is',
   struct: 'struct',
+  impl: 'impl',
   enum: 'enum',
   trigger: 'trigger',
   namespace: 'namespace',