sapdon 3.2.0 → 3.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sapdon",
-    "version": "3.2.0",
+    "version": "3.2.1",
     "scripts": {
         "build": "node scripts/build.cjs",
         "pub": "npm run build && npm publish"

package/prod/cli/start.js

@@ -7,11 +7,8 @@ import fs, { readFileSync } from 'fs';
 import { randomUUID } from 'crypto';
 import { fileURLToPath } from 'node:url';
 import cp from 'child_process';
-import { cacheSync } from '@sapdon/utils/cache.js';
 import fs$1 from 'fs/promises';
-import { serialize } from '@sapdon/utils/index.js';
 import http from 'http';
-import { handleRemoteLogger } from '@sapdon/cli/remoteLogger/server.js';
 import { rollup } from 'rollup';
 import commonjs from '@rollup/plugin-commonjs';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
@@ -112,6 +109,17 @@ function parseJsonWithComments(jsonStr) {
     return JSON.parse(String(jsonStr).replace(/\/\/.*|\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm, "$1"));
 }
 
+const caches = new Map();
+function cacheSync(uri, setter) {
+    let value = caches.get(uri);
+    if (value) {
+        return value;
+    }
+    value = setter(uri);
+    caches.set(uri, value);
+    return value;
+}
+
 function getBuildConfig() {
     const pwd = getProjectPath();
     const configFile = path.join(pwd, 'build.config');
@@ -378,6 +386,9 @@ if (!Symbol.metadata) {
     //@ts-ignore
     Symbol.metadata = Symbol('[[metadata]]');
 }
+function getMetadata(target) {
+    return target?.[Symbol.metadata];
+}
 
 // 因为无法判断其他代码实现的接口是否真的是RawType，所以用Symbol来标记
 // 只要不export，其他代码就无法访问这个Symbol， 确保了唯一性
@@ -418,6 +429,21 @@ function jsonEncoderReplacer(_, v) {
     }
     throw new Error('Unexpected value');
 }
+const defaultSerializer = instance => {
+    return structuredClone(instance);
+};
+const serializerSymbol = Symbol('serializer');
+const serializerMapping = new WeakMap();
+function serialize(inst) {
+    const ctor = Reflect.getPrototypeOf(inst)?.constructor;
+    if (!ctor) {
+        throw new Error('Cannot serialize an instance of an anonymous class');
+    }
+    const serializer = getMetadata(ctor)?.[serializerSymbol]
+        ?? serializerMapping.get(ctor)
+        ?? defaultSerializer;
+    return serializer.call(inst, inst);
+}
 const jsonEncodeDecoder = {
     encode(value) {
         return JSON.stringify(value, jsonEncoderReplacer);
@@ -553,6 +579,10 @@ class UISystemRegistryServer {
     }
 }
 
+async function handleRemoteLogger({ level, message, timeStamp, stack }) {
+    console[level](message, stack, `\nat ${new Date(timeStamp).toLocaleString()}`);
+}
+
 const clientRegistryData = [];
 /**
  * Client
@@ -754,7 +784,7 @@ function getGamePath() {
 }
 
 var name = "sapdon";
-var version = "3.2.0";
+var version = "3.2.1";
 var scripts = {
 	build: "node scripts/build.cjs",
 	pub: "npm run build && npm publish"

package/prod/core/index.d.ts

@@ -1406,13 +1406,13 @@ declare class ContainerUISystem {
 declare const ServerFormSystem: UISystem;
 declare const form_button_panel: Panel;
 declare class ServerUISystem {
-    static "__#1053@#binding_map": Map<any, any>;
-    static "__#1053@#binding_title_list": any[];
+    static "__#659@#binding_map": Map<any, any>;
+    static "__#659@#binding_title_list": any[];
     static addBindingTitle(title_name: any): void;
     static getBindingTitleList(): any[];
     static getBindingContentList(): any[];
     static bindingTitlewithContent(title_name: any, content: any): void;
-    static "__#1053@#updateServerFormSystem"(): void;
+    static "__#659@#updateServerFormSystem"(): void;
 }
 
 declare class Guidebook {
@@ -1621,15 +1621,15 @@ declare class DataBindingObject {
 }
 
 declare class UISystemRegistry {
-    static "__#1050@#ui_system_map": {};
-    static "__#1050@#ui_def_list": any[];
+    static "__#656@#ui_system_map": {};
+    static "__#656@#ui_def_list": any[];
     static registerUISystem(ui_system: any): void;
     static addOuterUIdefs(ui_defs: any): void;
     static submit(): void;
 }
 declare class UISystemRegistryServer {
-    static "__#1051@#ui_system_map": {};
-    static "__#1051@#ui_def_list": any[];
+    static "__#657@#ui_system_map": {};
+    static "__#657@#ui_def_list": any[];
     static getUISystemList(): any[];
     static getUIdefList(): any[];
     static startServer(): void;
@@ -2741,4 +2741,5 @@ declare namespace FlipbookTextures {
     function registerFlipbookTexture(atlas_tile: any, texture: any, ticks_per_frame: any, options?: {}): void;
 }
 
-export { BlockAPI, BlockComponent, Button, ButtonMapping$1 as ButtonMapping, ChestUISystem, CollectionPanel, type ConstructorOf, ContainerUISystem, Control, DataBinding, DataBindingObject, type EncodeDecoder, EntityAPI, Factory, FeatureAPI, FlipbookTextures, type FloatLiteral, Grid, GridProp, Guidebook, type ISerializer, Image, Input, ItemAPI, ItemCategory, ItemComponent, ItemTextureManager, Label, Layout, Matrix, Modifications, Panel, type RawType, RecipeAPI, ScrollView, ScrollingPanel, Serializable, Serializer, ServerFormSystem, ServerUISystem, Sound, Sprite, StackPanel, Text, UIElement, UISystem, UISystemRegistry, UISystemRegistryServer, Vec3, Vec4, type Vector3, type Vector4, decode, defaultSerializer, encode, f64, form_button_panel, getMetadata, getOrCreateMetadata, isRawJSON, jsonEncodeDecoder, jsonEncoderReplacer, registry, serialize, terrainTextureManager };
+export { BlockAPI, BlockComponent, Button, ButtonMapping$1 as ButtonMapping, ChestUISystem, CollectionPanel, ContainerUISystem, Control, DataBinding, DataBindingObject, EntityAPI, Factory, FeatureAPI, FlipbookTextures, Grid, GridProp, Guidebook, Image, Input, ItemAPI, ItemCategory, ItemComponent, ItemTextureManager, Label, Layout, Matrix, Modifications, Panel, RecipeAPI, ScrollView, ScrollingPanel, Serializable, Serializer, ServerFormSystem, ServerUISystem, Sound, Sprite, StackPanel, Text, UIElement, UISystem, UISystemRegistry, UISystemRegistryServer, Vec3, Vec4, decode, defaultSerializer, encode, f64, form_button_panel, getMetadata, getOrCreateMetadata, isRawJSON, jsonEncodeDecoder, jsonEncoderReplacer, registry, serialize, terrainTextureManager };
+export type { ConstructorOf, EncodeDecoder, FloatLiteral, ISerializer, RawType, Vector3, Vector4 };

package/prod/core/index.js

@@ -1,6 +1,4 @@
-import { serialize as serialize$1 } from '@sapdon/utils/index.js';
 import http from 'http';
-import '@sapdon/cli/remoteLogger/server.js';
 
 class BlockComponent {
     static setTick(interval_range, looping) {
@@ -1498,7 +1496,7 @@ class GRegistry {
     static register(name, root, path, data) {
         data = data === 'string'
             ? JSON.parse(data)
-            : serialize$1(data);
+            : serialize(data);
         clientRegistryData.push({ name, root, path, data });
     }
     static submit() {

package/prod/oc/index.d.ts

@@ -139,4 +139,5 @@ declare class PlayerInputCompatibilityComponent extends BaseComponent {
     onTick(manager: ComponentManager, en: Optional<Entity>): void;
 }
 
-export { Actor, BaseComponent, type BasicComponent, type Component, type ComponentCtor, type ComponentDescriptor, ComponentManager, CustomComponent, InputChangeState, Optional, PlayerInputCompatibilityComponent, PlayerInputComponent, RequireComponents, type RequiredComponent, oc };
+export { Actor, BaseComponent, ComponentManager, CustomComponent, InputChangeState, Optional, PlayerInputCompatibilityComponent, PlayerInputComponent, RequireComponents, oc };
+export type { BasicComponent, Component, ComponentCtor, ComponentDescriptor, RequiredComponent };

package/prod/utils/index.d.ts

@@ -38,4 +38,5 @@ declare const f64: (literal: FloatLiteral) => {
 };
 declare function isRawJSON(v: any): boolean;
 
-export { type ConstructorOf, type EncodeDecoder, type FloatLiteral, type ISerializer, type RawType, Serializable, Serializer, decode, defaultSerializer, encode, f64, getMetadata, getOrCreateMetadata, isRawJSON, jsonEncodeDecoder, jsonEncoderReplacer, serialize };
+export { Serializable, Serializer, decode, defaultSerializer, encode, f64, getMetadata, getOrCreateMetadata, isRawJSON, jsonEncodeDecoder, jsonEncoderReplacer, serialize };
+export type { ConstructorOf, EncodeDecoder, FloatLiteral, ISerializer, RawType };