@kite3d/engine 0.16.0 → 0.18.0

package/dist/version.js

@@ -1,4 +1,4 @@
-const n = "0.16.0", e = {
+const n = "0.18.0", e = {
   version: n
 }, o = e.version;
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kite3d/engine",
-  "version": "0.16.0",
+  "version": "0.18.0",
   "description": "The open Kite3D game runtime, project format, scripting helpers, and game plugins.",
   "type": "module",
   "license": "Apache-2.0",

package/src/generatorParams.ts

@@ -0,0 +1,182 @@
+export const generatorParamTypes = [
+    'boolean',
+    'number',
+    'integer',
+    'string',
+    'select',
+    'vector',
+    'color',
+    'json',
+] as const
+
+export type GeneratorParamType = typeof generatorParamTypes[number]
+
+export type GeneratorParamOption = string | number | {
+    value: string | number
+    label: string
+}
+
+export interface GeneratorParamDefinition {
+    type?: GeneratorParamType
+    label?: string
+    help?: string
+    default?: unknown
+    options?: GeneratorParamOption[]
+    min?: number
+    max?: number
+    step?: number
+}
+
+export interface GeneratorParamSchemaEntry extends Omit<GeneratorParamDefinition, 'type'> {
+    type: GeneratorParamType
+}
+
+export type GeneratorParamSchema = Record<string, GeneratorParamSchemaEntry>
+
+export function parseGeneratorParamsSchema(
+    exported: unknown,
+    module: string,
+    warn: (message: string) => void = console.warn,
+): GeneratorParamSchema {
+    if (exported === undefined) return {}
+    if (!isRecord(exported)) {
+        warn(`[kite3d] Ignoring invalid generator params export from ${module}: expected an object`)
+        return {}
+    }
+
+    const schema: GeneratorParamSchema = {}
+    for (const [key, value] of Object.entries(exported)) {
+        const parsed = parseEntry(value)
+        if (typeof parsed === 'string') {
+            warn(`[kite3d] Ignoring invalid generator param "${key}" from ${module}: ${parsed}`)
+            continue
+        }
+        schema[key] = parsed
+    }
+    return schema
+}
+
+export function inferGeneratorParam(value: unknown): GeneratorParamSchemaEntry {
+    if (typeof value === 'boolean') return {type: 'boolean'}
+    if (typeof value === 'number') return {type: 'number'}
+    if (isNumberVector(value)) return {type: 'vector'}
+    if (typeof value === 'string') return {type: 'string'}
+    return {type: 'json'}
+}
+
+export function validateGeneratorParam(value: unknown, entry: GeneratorParamSchemaEntry): string | undefined {
+    const name = entry.label || 'Value'
+    switch (entry.type) {
+        case 'boolean':
+            return typeof value === 'boolean' ? undefined : `${name} must be true or false.`
+        case 'number':
+        case 'integer': {
+            if (typeof value !== 'number' || !Number.isFinite(value)) return `${name} must be a number.`
+            if (entry.type === 'integer' && !Number.isInteger(value)) return `${name} must be an integer.`
+            if (entry.min !== undefined && value < entry.min) return `${name} must be at least ${entry.min}.`
+            if (entry.max !== undefined && value > entry.max) return `${name} must be at most ${entry.max}.`
+            return undefined
+        }
+        case 'string':
+            return typeof value === 'string' ? undefined : `${name} must be text.`
+        case 'select': {
+            if (typeof value !== 'string' && typeof value !== 'number') {
+                return `${name} must be one of the available options.`
+            }
+            if (entry.options?.length && !entry.options.some((option) => Object.is(optionValue(option), value))) {
+                return `${name} must be one of the available options.`
+            }
+            return undefined
+        }
+        case 'vector':
+            return isNumberVector(value) ? undefined : `${name} must be an array of 2 to 4 numbers.`
+        case 'color':
+            return typeof value === 'string' && /^#[\da-f]{6}$/i.test(value)
+                ? undefined
+                : `${name} must be a six-digit hex color.`
+        case 'json':
+            return isJsonValue(value) ? undefined : `${name} must be a JSON value.`
+    }
+}
+
+function parseEntry(value: unknown): GeneratorParamSchemaEntry | string {
+    if (!isRecord(value)) return 'expected an object'
+    if (value.type !== undefined && !generatorParamTypes.includes(value.type as GeneratorParamType)) {
+        return `unknown type ${JSON.stringify(value.type)}`
+    }
+    if (value.label !== undefined && typeof value.label !== 'string') return 'label must be a string'
+    if (value.help !== undefined && typeof value.help !== 'string') return 'help must be a string'
+    if (value.options !== undefined && !isOptions(value.options)) return 'options must contain strings, numbers, or labeled values'
+    for (const bound of ['min', 'max', 'step'] as const) {
+        if (value[bound] !== undefined && !isFiniteNumber(value[bound])) return `${bound} must be a finite number`
+    }
+    if (isFiniteNumber(value.step) && value.step <= 0) return 'step must be greater than zero'
+    if (isFiniteNumber(value.min) && isFiniteNumber(value.max) && value.min > value.max) {
+        return 'min must not be greater than max'
+    }
+
+    const type = value.type as GeneratorParamType | undefined
+        ?? (value.options !== undefined ? 'select' : inferGeneratorParam(value.default).type)
+    if ((value.min !== undefined || value.max !== undefined || value.step !== undefined)
+        && type !== 'number' && type !== 'integer') {
+        return 'min, max, and step require a number or integer type'
+    }
+    if (value.options !== undefined && type !== 'select') return 'options require the select type'
+
+    const entry: GeneratorParamSchemaEntry = {
+        type,
+        ...(value.label !== undefined ? {label: value.label} : {}),
+        ...(value.help !== undefined ? {help: value.help} : {}),
+        ...(Object.prototype.hasOwnProperty.call(value, 'default') ? {default: value.default} : {}),
+        ...(value.options !== undefined ? {options: value.options} : {}),
+        ...(isFiniteNumber(value.min) ? {min: value.min} : {}),
+        ...(isFiniteNumber(value.max) ? {max: value.max} : {}),
+        ...(isFiniteNumber(value.step) ? {step: value.step} : {}),
+    }
+    if (Object.prototype.hasOwnProperty.call(entry, 'default')) {
+        const error = validateGeneratorParam(entry.default, entry)
+        if (error) return `invalid default: ${error}`
+    }
+    return entry
+}
+
+function isOptions(value: unknown): value is GeneratorParamOption[] {
+    return Array.isArray(value) && value.every((option) => {
+        if (typeof option === 'string' || typeof option === 'number') return true
+        return isRecord(option)
+            && (typeof option.value === 'string' || typeof option.value === 'number')
+            && typeof option.label === 'string'
+    })
+}
+
+function optionValue(option: GeneratorParamOption): string | number {
+    return typeof option === 'object' ? option.value : option
+}
+
+function isNumberVector(value: unknown): value is number[] {
+    return Array.isArray(value)
+        && value.length >= 2
+        && value.length <= 4
+        && value.every(isFiniteNumber)
+}
+
+function isFiniteNumber(value: unknown): value is number {
+    return typeof value === 'number' && Number.isFinite(value)
+}
+
+function isJsonValue(value: unknown, seen = new Set<object>()): boolean {
+    if (value === null || typeof value === 'string' || typeof value === 'boolean') return true
+    if (typeof value === 'number') return Number.isFinite(value)
+    if (!value || typeof value !== 'object' || seen.has(value)) return false
+    seen.add(value)
+    const valid = Array.isArray(value)
+        ? value.every((item) => isJsonValue(item, seen))
+        : Object.getPrototypeOf(value) === Object.prototype
+            && Object.values(value).every((item) => isJsonValue(item, seen))
+    seen.delete(value)
+    return valid
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+    return Boolean(value) && typeof value === 'object' && !Array.isArray(value)
+}

package/src/index.ts

@@ -7,6 +7,7 @@ export * from './paths.ts'
 export * from './sceneSerialization.ts'
 export * from './authoring.ts'
 export * from './authoringValidation.ts'
+export * from './generatorParams.ts'
 export * from './plugins/HtmlUiComponent.ts'
 export * from './plugins/GeneratorComponent.ts'
 export * from './plugins/cannon/CannonPhysicsPlugin.ts'

package/src/plugins/GeneratorComponent.ts

@@ -6,6 +6,11 @@ import {
     type ThreeViewer,
 } from 'threepipe'
 import {getAuthoringMetadata, setAuthoringMetadata, type AuthoringMetadata} from '../authoring.ts'
+import {
+    parseGeneratorParamsSchema,
+    type GeneratorParamDefinition,
+    type GeneratorParamSchema,
+} from '../generatorParams.ts'
 
 export interface GeneratorParams {
     [key: string]: unknown
@@ -20,6 +25,7 @@ export interface GeneratorContext {
 
 export interface GeneratorModule {
     default?: (context: GeneratorContext) => unknown | Promise<unknown>
+    params?: Record<string, GeneratorParamDefinition>
 }
 
 export interface GeneratorViewerOptions {
@@ -42,6 +48,7 @@ export class GeneratorComponent extends Object3DComponent {
 
     module = ''
     params: GeneratorParams = {}
+    schema: GeneratorParamSchema = {}
     private runRevision = 0
 
     static configureViewer(viewer: ThreeViewer, options: GeneratorViewerOptions): void {
@@ -78,6 +85,7 @@ export class GeneratorComponent extends Object3DComponent {
             base: config.base,
             revision: ++generatorImportRevision,
             isCurrent: () => revision === this.runRevision,
+            onSchema: (schema) => { this.schema = schema },
         }).then(() => {
             if (revision === this.runRevision) viewer.setDirty(this)
         }).finally(() => config.pending.delete(task))
@@ -122,6 +130,7 @@ export interface RunGeneratorOptions extends Omit<GeneratorContext, 'engine'> {
     base: URL
     revision?: number
     isCurrent?: () => boolean
+    onSchema?: (schema: GeneratorParamSchema) => void
 }
 
 export async function runGenerator({
@@ -132,13 +141,16 @@ export async function runGenerator({
     base,
     revision = 0,
     isCurrent,
+    onSchema,
 }: RunGeneratorOptions): Promise<IObject3D[]> {
     removeGeneratedChildren(node)
+    onSchema?.({})
     if (!module) return []
     const source = ensureGeneratorMetadata(node)
     const moduleUrl = resolveGeneratorModule(module, base)
     if (revision) moduleUrl.searchParams.set('kite3d-generator', String(revision))
     const loaded = await importGeneratorModule(moduleUrl.href)
+    if (!isCurrent || isCurrent()) onSchema?.(parseGeneratorParamsSchema(loaded.params, module))
     if (typeof loaded.default !== 'function') {
         throw new Error(`Generator module must have a default generate function: ${module}`)
     }

package/src/runtime/createGame.ts

@@ -29,8 +29,8 @@ import {
 } from '../authoringValidation.ts'
 import {RuntimeNestedAssetLoader} from './nestedAssets.ts'
 import {
-    assetUrlPrefix,
     AssetsJSONManifest,
+    createProjectAssetURLModifier,
     ExternalPlugin,
     isDependencyModuleSpecifier,
     parseAssetsJSONManifest,
@@ -142,7 +142,7 @@ async function createProjectGame({
 
         // Three's LoadingManager delegates through this importer hook. It covers
         // glTF buffers/textures and nested imports without patching global fetch.
-        const urlModifier = createURLModifier(baseUrl, assetsManifest)
+        const urlModifier = createProjectAssetURLModifier(baseUrl, assetsManifest)
         viewer.assetManager.importer.addURLModifier(urlModifier)
         removeURLModifier = () => viewer?.assetManager.importer.removeURLModifier(urlModifier)
 
@@ -246,22 +246,6 @@ async function registerProjectScripts(
     await registerScripts(viewer, modules)
 }
 
-function createURLModifier(base: URL, assets: AssetsJSONManifest) {
-    const assetIdPrefix = `${assetUrlPrefix}@`
-    return (url: string): string => {
-        if (url.startsWith(assetIdPrefix)) {
-            const id = url.slice(assetIdPrefix.length).split('/', 1)[0]
-            const asset = assets.files[id]
-            if (!asset?.path) throw new Error(`Unknown asset id in URL: ${id}`)
-            return new URL(asset.path, base).href
-        }
-        if (url.startsWith(assetUrlPrefix)) {
-            return new URL(url.slice(assetUrlPrefix.length), base).href
-        }
-        return url
-    }
-}
-
 function resolvePluginSpecifier(
     definition: ExternalPlugin,
     packageJson: ProjectPackageJSON,

package/src/runtime/projectFormat.ts

@@ -1,4 +1,5 @@
 import {parse, ParseError} from 'jsonc-parser'
+import type {GeneratorParamSchema} from '../generatorParams.ts'
 
 export const settingsKey = 'kite3d'
 export const assetUrlPrefix = `/${settingsKey}/`
@@ -12,15 +13,41 @@ export interface ProjectGeneratorState {
     nodeIndex: number
     nodeName: string
     params: Record<string, unknown>
+    schema: GeneratorParamSchema
 }
 
 export interface AssetsJSONManifest {
     files: Record<string, {
         path: string
+        files?: Record<string, string>
     }>
     version: number
 }
 
+export function createProjectAssetURLModifier(base: URL, assets: AssetsJSONManifest) {
+    const assetIdPrefix = `${assetUrlPrefix}@`
+    return (url: string): string => {
+        if (url.startsWith(assetIdPrefix)) {
+            const request = new URL(url, 'https://kite3d.invalid')
+            const relative = decodeURIComponent(request.pathname.slice(assetIdPrefix.length))
+            const slash = relative.indexOf('/')
+            const id = slash < 0 ? relative : relative.slice(0, slash)
+            const assetPath = slash < 0 ? '' : relative.slice(slash + 1)
+            const asset = assets.files[id]
+            if (!asset?.path) throw new Error(`Unknown asset id in URL: ${id}`)
+            const registered = asset.files?.[assetPath]
+            if (registered) return new URL(registered, base).href
+            if (asset.files) throw new Error(`Unknown file for asset ${id}: ${assetPath}`)
+            if (/^f\.[^/]+$/i.test(assetPath)) return new URL(asset.path, base).href
+            return new URL(assetPath, new URL(asset.path, base)).href
+        }
+        if (url.startsWith(assetUrlPrefix)) {
+            return new URL(url.slice(assetUrlPrefix.length), base).href
+        }
+        return url
+    }
+}
+
 export interface ProjectDependency {
     key: string
     version: string
@@ -140,6 +167,7 @@ export function readProjectGeneratorStates(text: string): ProjectGeneratorState[
                     nodeIndex,
                     nodeName: typeof node.name === 'string' ? node.name : `Node ${nodeIndex}`,
                     params: isRecord(component.state.params) ? component.state.params : {},
+                    schema: {},
                 })
             }
         }